From e25aa4f004b7b0638c6cccbe9ec8a68cadbcfc6d Mon Sep 17 00:00:00 2001 From: James Turner Date: Thu, 14 Nov 2013 16:37:36 +0000 Subject: [PATCH] Fix some static property references. (These cause problems when replacing the property tree during reset) --- src/GUI/CanvasWidget.cxx | 3 --- src/GUI/CanvasWidget.hxx | 2 +- src/Main/main.cxx | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/GUI/CanvasWidget.cxx b/src/GUI/CanvasWidget.cxx index fc21d0c93..17964d175 100644 --- a/src/GUI/CanvasWidget.cxx +++ b/src/GUI/CanvasWidget.cxx @@ -29,9 +29,6 @@ #include #include -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 63d648c7b..0dd654367 100644 --- 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 dd7951a14..3f82429bf 100644 --- 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 -- 2.39.5