From 71a8eac8bd991106a37367c3e9a9fe7b2ae904dd Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 6 Oct 2013 17:34:03 +0100 Subject: [PATCH] Reset: view manager can be be shutdown. --- src/Viewer/viewmgr.cxx | 12 ++++++++++++ src/Viewer/viewmgr.hxx | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Viewer/viewmgr.cxx b/src/Viewer/viewmgr.cxx index 5af533126..6d7035777 100644 --- a/src/Viewer/viewmgr.cxx +++ b/src/Viewer/viewmgr.cxx @@ -141,6 +141,16 @@ FGViewMgr::init () do_bind(); } +void +FGViewMgr::shutdown() +{ + if (!inited) { + return; + } + + inited = false; +} + void FGViewMgr::reinit () { @@ -290,6 +300,8 @@ void FGViewMgr::unbind () { _tiedProperties.Untie(); + config_list.clear(); + view_number.clear(); } void diff --git a/src/Viewer/viewmgr.hxx b/src/Viewer/viewmgr.hxx index 0a7833ea0..b8711be8c 100644 --- a/src/Viewer/viewmgr.hxx +++ b/src/Viewer/viewmgr.hxx @@ -53,7 +53,8 @@ public: virtual void unbind (); virtual void update (double dt); virtual void reinit (); - + virtual void shutdown(); + // getters inline int size() const { return views.size(); } inline int get_current() const { return current; } -- 2.39.5