From: James Turner <zakalawe@mac.com>
Date: Fri, 7 Mar 2014 12:40:14 +0000 (+0000)
Subject: Throw the reset switch.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=86ba2a1628268c20f380265b3818d05b5bfd4bec;p=flightgear.git

Throw the reset switch.

- fix up CanvasMgr so canvas works after new reset.
---

diff --git a/src/Canvas/gui_mgr.cxx b/src/Canvas/gui_mgr.cxx
index 453893886..82b07615c 100644
--- a/src/Canvas/gui_mgr.cxx
+++ b/src/Canvas/gui_mgr.cxx
@@ -194,14 +194,6 @@ DesktopGroup::DesktopGroup():
   stateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
 
   _width = _height = -1;
-
-  // Do not change values on reinit
-  _width.node()->setAttribute(SGPropertyNode::PRESERVE, true);
-  _height.node()->setAttribute(SGPropertyNode::PRESERVE, true);
-
-  // Do not restore windows on reinit (all windows will need to be recreated,
-  // but hey it's a reset ;-))
-  _node->setAttribute(SGPropertyNode::PRESERVE, true);
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 5e0e71368..9653a11ae 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -142,7 +142,7 @@
 #include <GUI/CocoaHelpers.h> // for Mac impl of platformDefaultDataPath()
 #endif
 
-//#define NEW_RESET 1
+#define NEW_RESET 1
 
 using std::string;
 using std::endl;