ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Leak an object when quitting Dolphin to try and fix issue 6546" 

This reverts commit 380b780dd1.

Revert "Move the CFrame::ClosePages call from ~CFrame to CFrame::OnClose"
This reverts commit e29de302a6.
This commit is contained in:
Shawn Hoffman 2013-09-10 01:04:29 -07:00
parent 4add0f55e0
commit 2d492bdc4f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -387,6 +387,10 @@ CFrame::~CFrame()
#if defined(HAVE_XRANDR) && HAVE_XRANDR #if defined(HAVE_XRANDR) && HAVE_XRANDR
delete m_XRRConfig; delete m_XRRConfig;
#endif #endif
ClosePages();
delete m_Mgr;
} }
bool CFrame::RendererIsFullscreen() bool CFrame::RendererIsFullscreen()
@ -472,7 +476,6 @@ void CFrame::OnClose(wxCloseEvent& event)
m_LogWindow = NULL; m_LogWindow = NULL;
} }
ClosePages();
// Uninit // Uninit
m_Mgr->UnInit(); m_Mgr->UnInit();