From 3186482281ee67bd1bfc1f148a451733e33a95eb Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 4 Apr 2015 14:14:28 -0700
Subject: [PATCH] Qt: Fix Display object leak when closing a window

---
 CHANGES                    | 1 +
 src/platform/qt/Window.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 8471b85e3..7c1f5e25d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 Bugfixes:
  - GBA: Fix timers not updating timing when writing to only the reload register
  - All: Fix sanitize-deb script not cleaning up after itself
+ - Qt: Fix Display object leak when closing a window
 
 0.2.0: (2015-04-03)
 Features:
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index ca01cb151..8af02b2ac 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -67,7 +67,7 @@ Window::Window(ConfigController* config, int playerId, QWidget* parent)
 
 	QGLFormat format(QGLFormat(QGL::Rgba | QGL::DoubleBuffer));
 	format.setSwapInterval(1);
-	m_display = new Display(format);
+	m_display = new Display(format, this);
 
 	m_logo.setDevicePixelRatio(m_screenWidget->devicePixelRatio());
 	m_logo = m_logo; // Free memory left over in old pixmap