From 2d492bdc4f062551ebc8acc54f53169d4fb7d5d5 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Tue, 10 Sep 2013 01:04:29 -0700
Subject: [PATCH] Revert "Leak an object when quitting Dolphin to try and fix
 issue 6546"

This reverts commit 380b780dd195498bc6d3e614256dd8f0f70143a8.

Revert "Move the CFrame::ClosePages call from ~CFrame to CFrame::OnClose"
This reverts commit e29de302a61137328fc89a3c3e662ef84ce928c5.
---
 Source/Core/DolphinWX/Src/Frame.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 321cd5fda0..9c76cd5420 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -387,6 +387,10 @@ CFrame::~CFrame()
 	#if defined(HAVE_XRANDR) && HAVE_XRANDR
 		delete m_XRRConfig;
 	#endif
+
+	ClosePages();
+
+	delete m_Mgr;
 }
 
 bool CFrame::RendererIsFullscreen()
@@ -472,7 +476,6 @@ void CFrame::OnClose(wxCloseEvent& event)
 		m_LogWindow = NULL;
 	}
 
-	ClosePages();
 
 	// Uninit
 	m_Mgr->UnInit();