From acd755324e07589982bf6281a310ead9fc07e4d0 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 4 Sep 2020 15:00:16 +0100
Subject: [PATCH] Load main window initial layout before running python scripts

---
 qrenderdoc/Code/CaptureContext.cpp | 2 ++
 qrenderdoc/Windows/MainWindow.cpp  | 4 +---
 qrenderdoc/Windows/MainWindow.h    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp
index d9a3834d1..09ae304b0 100644
--- a/qrenderdoc/Code/CaptureContext.cpp
+++ b/qrenderdoc/Code/CaptureContext.cpp
@@ -89,6 +89,8 @@ CaptureContext::CaptureContext(PersistantConfig &cfg) : m_Config(cfg)
 
   m_MainWindow = new MainWindow(*this);
 
+  m_MainWindow->LoadInitialLayout();
+
   {
     QDir dir(configFilePath("extensions"));
 
diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp
index 2c263e0cc..290fd24f3 100644
--- a/qrenderdoc/Windows/MainWindow.cpp
+++ b/qrenderdoc/Windows/MainWindow.cpp
@@ -1534,7 +1534,7 @@ ToolWindowManager::AreaReference MainWindow::leftToolArea()
   return ToolWindowManager::AreaReference(ToolWindowManager::LastUsedArea);
 }
 
-void MainWindow::show()
+void MainWindow::LoadInitialLayout()
 {
   bool loaded = LoadLayout(0);
 
@@ -1584,8 +1584,6 @@ void MainWindow::show()
         ToolWindowManager::AreaReference(ToolWindowManager::TopWindowSide,
                                          ui->toolWindowManager->areaOf(textureViewer), 0.2f));
   }
-
-  QMainWindow::show();
 }
 
 void MainWindow::RemoveRecentCapture(const QString &filename)
diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h
index 368d2ae98..3825d36eb 100644
--- a/qrenderdoc/Windows/MainWindow.h
+++ b/qrenderdoc/Windows/MainWindow.h
@@ -71,7 +71,7 @@ public:
   ToolWindowManager::AreaReference mainToolArea();
   ToolWindowManager::AreaReference leftToolArea();
 
-  void show();
+  void LoadInitialLayout();
 
   void setProgress(float val);
   void setRemoteHost(int hostIdx);