From 1c2e2f86c5f16a3b23a180fd618ca79b1689f54d Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 12 Sep 2013 09:07:29 +0200
Subject: [PATCH] Restore window layout when regression tests have completed
 p4#: 22390

---
 ApplicationCode/Application/RiaApplication.cpp | 6 ++++--
 ApplicationCode/UserInterface/RiuMainWindow.h  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index 25b7c0ca7f..c1795f5d82 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -865,9 +865,11 @@ bool RiaApplication::parseArguments()
         if (mainWnd)
         {
             mainWnd->hideAllDockWindows();
-        }
 
-        runRegressionTest(regressionTestPath);
+            runRegressionTest(regressionTestPath);
+
+            mainWnd->loadWinGeoAndDockToolBarLayout();
+        }
 
         return false;
     }
diff --git a/ApplicationCode/UserInterface/RiuMainWindow.h b/ApplicationCode/UserInterface/RiuMainWindow.h
index 0317283d15..90ada1ab64 100644
--- a/ApplicationCode/UserInterface/RiuMainWindow.h
+++ b/ApplicationCode/UserInterface/RiuMainWindow.h
@@ -87,6 +87,7 @@ public:
     RiuProcessMonitor* processMonitor();
 
     void            hideAllDockWindows();
+    void			loadWinGeoAndDockToolBarLayout();
 
     void            setCurrentObjectInTreeView(caf::PdmObject* object);
 
@@ -101,7 +102,6 @@ private:
     void            createToolBars();
     void            createDockPanels();
     void			saveWinGeoAndDockToolBarLayout();
-    void			loadWinGeoAndDockToolBarLayout();
 
     bool            checkForDocumentModifications();