Fix some static property references.

(These cause problems when replacing the property tree during reset)

diff --git a/src/GUI/CanvasWidget.cxx b/src/GUI/CanvasWidget.cxx
index fc21d0c93cb1acfed2abd64a6061a129e2aa9a7f..17964d175abad8fbe461d380dd7a38714c72678f 100644 (file)
--- a/src/GUI/CanvasWidget.cxx
+++ b/src/GUI/CanvasWidget.cxx
@@ -29,9 +29,6 @@
 #include <simgear/canvas/Canvas.hxx>
 #include <simgear/canvas/MouseEvent.hxx>
 
-SGPropertyNode_ptr CanvasWidget::_time,
-                   CanvasWidget::_view_height;
-
 //------------------------------------------------------------------------------
 CanvasWidget::CanvasWidget( int x, int y,
                             int width, int height,

diff --git a/src/GUI/CanvasWidget.hxx b/src/GUI/CanvasWidget.hxx
index 63d648c7b58ceaf99460433b50c8e751f5b5baed..0dd6543679013e585767a7e49f47c427f2dbd89c 100644 (file)
--- a/src/GUI/CanvasWidget.hxx
+++ b/src/GUI/CanvasWidget.hxx
@@ -55,7 +55,7 @@ class CanvasWidget:
                           //   automatically resized if the size of the widget
                           //   changes.
 
-    static SGPropertyNode_ptr _time,
+    SGPropertyNode_ptr _time,
                               _view_height;
 };
 

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index dd7951a14a3422abdea4694dcfce0e0d177cea3a..3f82429bf1c7f39d6b6718215bf5a4dc934607a7 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -392,6 +392,7 @@ int fgMainInit( int argc, char **argv ) {
     
     // pass control off to the master event handler
     int result = fgOSMainLoop();
+    frame_signal.clear();
     fgOSCloseWindow();
     
     // clean up here; ensure we null globals to avoid