mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-09 23:59:27 +01:00
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.
This commit is contained in:
parent
4add0f55e0
commit
2d492bdc4f
@ -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();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user