Fix for reset causing view problems when not in pilot view.

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 0c9fbd52192f0913d8ab1f39871924a5db1ea709..5987109497856665ad019bf264b37d6f86953cc5 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -642,6 +642,7 @@ void fgInitFDM() {
 void fgInitView() {
   // force update of model so that viewer can get some data...
   globals->get_aircraft_model()->update(0);
+  // run update for current view so that data is current...
   globals->get_viewmgr()->update(0);
 }
 
@@ -1116,6 +1117,9 @@ void fgReInitSubsystems( void )
     // model or control parameters are set
     fgAircraftInit();   // In the future this might not be the case.
 
+    // copy viewer settings into current-view path
+    globals->get_viewmgr()->copyToCurrent();
+
     fgInitView();
 
     globals->get_controls()->reset_all();

diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx
index 6101f2aef8b10f72d047bb27de40b9a6311cc6a8..6c509f9aeeff7c88898c9249fc70537ee1c7f6f7 100644 (file)
--- a/src/Main/viewmgr.hxx
+++ b/src/Main/viewmgr.hxx
@@ -111,6 +111,8 @@ public:
        views.push_back(v);
         v->init();
     }
+    // copies current offset settings to current-view path...
+    void copyToCurrent ();
 
 private:
 
@@ -139,7 +141,6 @@ private:
     void setNear_m (double near_m);
     void setViewAxisLong (double axis);
     void setViewAxisLat (double axis);
-    void copyToCurrent ();
 
     typedef vector < FGViewer * > viewer_list;
     viewer_list views;