Revert "Leak an object when quitting Dolphin to try and fix issue 6546"
This reverts commit380b780dd1
. Revert "Move the CFrame::ClosePages call from ~CFrame to CFrame::OnClose" This reverts commite29de302a6
.
This commit is contained in:
parent
4add0f55e0
commit
2d492bdc4f
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue