#2920 Save window state for main window when closing plot window last (and vice versa).

ApplicationCode/Application/RiaApplication.cpp

@@ -1536,6 +1536,23 @@ void RiaApplication::waitUntilCommandObjectsHasBeenProcessed()
     m_commandQueueLock.unlock();
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiaApplication::saveWinGeoAndDockToolBarLayout()
+{
+    if (m_mainPlotWindow)
+    {
+        m_mainPlotWindow->saveWinGeoAndDockToolBarLayout();
+    }
+
+    if (RiuMainWindow::instance())
+    {
+        RiuMainWindow::instance()->saveWinGeoAndDockToolBarLayout();
+    }
+
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Application/RiaApplication.h

@@ -200,7 +200,7 @@ public:
     static std::vector<QString> readFileListFromTextFile(QString listFileName);
 
     void                waitUntilCommandObjectsHasBeenProcessed();
-
+    void                saveWinGeoAndDockToolBarLayout();
 
 private:
     void                    onProjectOpenedOrClosed();

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -250,7 +250,7 @@ void RiuMainWindow::closeEvent(QCloseEvent* event)
         return;
     }
 
-    saveWinGeoAndDockToolBarLayout();
+    app->saveWinGeoAndDockToolBarLayout();
 
     if (!app->tryClosePlotWindow()) return;
 

ApplicationCode/UserInterface/RiuPlotMainWindow.cpp

@@ -151,7 +151,7 @@ void RiuPlotMainWindow::closeEvent(QCloseEvent* event)
         return;
     }
 
-    saveWinGeoAndDockToolBarLayout();
+    app->saveWinGeoAndDockToolBarLayout();
 
     if (!app->tryCloseMainWindow())
         return;