Reset: use new copy-properties helper.

[flightgear.git] / src / Main / options.cxx

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 691e7be2405623058820e71de5dd7e1209c3f3da..44d5d7c5fc10bd1f7d75efbb97e2c952f6ed4e6b 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -1928,6 +1928,10 @@ void Options::initAircraft()
     SG_LOG(SG_INPUT, SG_INFO, "No user specified aircraft, using default" );
   }
   
+// persist across reset
+  SGPropertyNode* aircraftProp = fgGetNode("/sim/aircraft", true);
+  aircraftProp->setAttribute(SGPropertyNode::PRESERVE, true);
+    
   if (p->showAircraft) {
     fgOptLogLevel( "alert" );
     SGPath path( globals->get_fg_root() );
@@ -2346,12 +2350,12 @@ string Options::platformDefaultRoot() const
   return "../data";
 }
 
-#elif defined(_WIN32)
+#elif defined(SG_WINDOWS)
 string Options::platformDefaultRoot() const
 {
   return "..\\data";
 }
-#elif defined(__APPLE__)
+#elif defined(SG_MAC)
 // platformDefaultRoot defined in CocoaHelpers.mm
 #else
 string Options::platformDefaultRoot() const