Merge pull request #6600 from lioncash/leak

DolphinQt2/MainWindow: Resolve a memory leak on systems with X11
dolphin-emu · Apr 5, 2018 · a66c7d6 · a66c7d6
2 parents d0b7c01 + 839fc7e
commit a66c7d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -221,12 +221,11 @@ void MainWindow::CreateComponents()
           &MemoryWidget::Update);
 
 #if defined(HAVE_XRANDR) && HAVE_XRANDR
-  m_graphics_window = new GraphicsWindow(
-      new X11Utils::XRRConfiguration(
-          static_cast<Display*>(QGuiApplication::platformNativeInterface()->nativeResourceForWindow(
-              "display", windowHandle())),
-          winId()),
-      this);
+  m_xrr_config = std::make_unique<X11Utils::XRRConfiguration>(
+      static_cast<Display*>(QGuiApplication::platformNativeInterface()->nativeResourceForWindow(
+          "display", windowHandle())),
+      winId());
+  m_graphics_window = new GraphicsWindow(m_xrr_config.get(), this);
 #else
   m_graphics_window = new GraphicsWindow(nullptr, this);
 #endif

diff --git a/Source/Core/DolphinQt2/MainWindow.h b/Source/Core/DolphinQt2/MainWindow.h
@@ -43,6 +43,11 @@ class SettingsWindow;
 class WatchWidget;
 class WiiTASInputWindow;
 
+namespace X11Utils
+{
+class XRRConfiguration;
+}
+
 class MainWindow final : public QMainWindow
 {
   Q_OBJECT
@@ -146,6 +151,10 @@ class MainWindow final : public QMainWindow
   void dropEvent(QDropEvent* event) override;
   QSize sizeHint() const override;
 
+#if defined(HAVE_XRANDR) && HAVE_XRANDR
+  std::unique_ptr<X11Utils::XRRConfiguration> m_xrr_config;
+#endif
+
   QProgressDialog* m_progress_dialog = nullptr;
   QStackedWidget* m_stack;
   ToolBar* m_tool_bar;