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

Fix initial value for tied read-only properties

Browse Source
This commit is contained in:
Torsten Dreyer 2011-02-12 14:46:58 +01:00
parent c684f8f043
commit 3a620fe55d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
simgear/props/props.cxx
View File

@ -1615,8 +1615,12 @@ bool SGPropertyNode::tie (const SGRawValue<const char *> &rawValue,
_tied = true;
_value.val = rawValue.clone();
if (useDefault)
if (useDefault) {
int save_attributes = getAttributes();
setAttribute( WRITE, true );
setStringValue(old_val.c_str());
setAttributes( save_attributes );
}
return true;
}

6
simgear/props/props.hxx
View File

@ -1786,8 +1786,12 @@ bool SGPropertyNode::tie(const SGRawValue<T> &rawValue, bool useDefault)
_type = EXTENDED;
_tied = true;
_value.val = rawValue.clone();
if (useDefault)
if (useDefault) {
int save_attributes = getAttributes();
setAttribute( WRITE, true );
setValue(old_val);
setAttributes( save_attributes );
}
return true;
}