FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prevent animations from losing nodes, because other processes removed them

Browse Source 
(We are currently getting a lot of aborts in the condition code when
running MP. I don't expect this to fix it, but a bug is a bug.)

(reviewed by Fred, who also fixed *my* bugs :-)
This commit is contained in:
mfranz 2006-03-14 10:38:06 +00:00
parent bd1f192dc4
commit 2e078aff7d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
simgear/props/condition.cxx
View File

@ -235,7 +235,6 @@ SGComparisonCondition::SGComparisonCondition (Type type, bool reverse)
SGComparisonCondition::~SGComparisonCondition () SGComparisonCondition::~SGComparisonCondition ()
{ {
delete _right_value;
} }
bool bool
@ -267,7 +266,6 @@ void
SGComparisonCondition::setRightProperty( SGPropertyNode *prop_root, SGComparisonCondition::setRightProperty( SGPropertyNode *prop_root,
const char * propname ) const char * propname )
{ {
delete _right_value;
_right_value = 0; _right_value = 0;
_right_property = prop_root->getNode(propname, true); _right_property = prop_root->getNode(propname, true);
} }
@ -276,7 +274,6 @@ void
SGComparisonCondition::setRightValue (const SGPropertyNode *node) SGComparisonCondition::setRightValue (const SGPropertyNode *node)
{ {
_right_property = 0; _right_property = 0;
delete _right_value;
_right_value = new SGPropertyNode(*node); _right_value = new SGPropertyNode(*node);
} }

8
simgear/props/condition.hxx
View File

@ -51,7 +51,7 @@ public:
virtual ~SGPropertyCondition (); virtual ~SGPropertyCondition ();
virtual bool test () const { return _node->getBoolValue(); } virtual bool test () const { return _node->getBoolValue(); }
private: private:
const SGPropertyNode * _node; SGConstPropertyNode_ptr _node;
}; };
@ -133,9 +133,9 @@ public:
private: private:
Type _type; Type _type;
bool _reverse; bool _reverse;
const SGPropertyNode * _left_property; SGConstPropertyNode_ptr _left_property;
const SGPropertyNode * _right_property; SGConstPropertyNode_ptr _right_property;
const SGPropertyNode * _right_value; SGConstPropertyNode_ptr _right_value;
}; };