Bug 947, menu item state wrong after reset.

Mark the entire /sim/menubar tree as PRESERVED, so reset doesn't
mess up all the state.

diff --git a/src/GUI/new_gui.cxx b/src/GUI/new_gui.cxx
index 28e463bc6b259da81838e2cb86b3e326147727c0..8ca5c12c5b9c03845f50713325e9aba92e1d4448 100644 (file)
--- a/src/GUI/new_gui.cxx
+++ b/src/GUI/new_gui.cxx
@@ -76,6 +76,9 @@ NewGUI::init ()
     readDir(p);
     const std::string aircraft_dir(fgGetString("/sim/aircraft-dir"));
     readDir( SGPath(aircraft_dir, "gui/dialogs") );
+    
+    // Fix for http://code.google.com/p/flightgear-bugs/issues/detail?id=947
+    fgGetNode("sim/menubar")->setAttribute(SGPropertyNode::PRESERVE, true);
     _menubar->init();
 }
 

diff --git a/src/MultiPlayer/multiplaymgr.cxx b/src/MultiPlayer/multiplaymgr.cxx
index 62ca039de3c56ebb0ad681e06ac5d8b34fbfc680..d58d2b900de1c9fdc8140e22305ef7f8f088a752 100644 (file)
--- a/src/MultiPlayer/multiplaymgr.cxx
+++ b/src/MultiPlayer/multiplaymgr.cxx
@@ -428,6 +428,8 @@ FGMultiplayMgr::init (void)
   mTimeUntilSend = 0.0;
   
   mCallsign = fgGetString("/sim/multiplay/callsign");
+  fgGetNode("/sim/multiplay/callsign", true)->setAttribute(SGPropertyNode::PRESERVE, true);
+    
   if ((!txAddress.empty()) && (txAddress!="0")) {
     mServer.set(txAddress.c_str(), txPort);
     if (strncmp (mServer.getHost(), "0.0.0.0", 8) == 0) {