Merge pull request #7206 from delroth/qt-boottime

dqt2: lazy-initialize GraphicsWindow

1 files changed, 11 insertions, 0 deletions

diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.cpp b/Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.cpp
index bccac209de..0aaa900588 100644
--- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/Graphics/GraphicsWindow.cpp
@@ -27,6 +27,17 @@
 GraphicsWindow::GraphicsWindow(X11Utils::XRRConfiguration* xrr_config, MainWindow* parent)
     : QDialog(parent), m_xrr_config(xrr_config)
 {
+  // GraphicsWindow initialization is heavy due to dependencies on the graphics subsystem.
+  // To prevent blocking startup, we create the layout and children at first show time.
+}
+
+void GraphicsWindow::Initialize()
+{
+  if (m_lazy_initialized)
+    return;
+
+  m_lazy_initialized = true;
+
   g_Config.Refresh();
   g_video_backend->InitBackendInfo();