Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "Leak an object when quitting Dolphin to try and fix issue 6546"
This reverts commit 380b780.

Revert "Move the CFrame::ClosePages call from ~CFrame to CFrame::OnClose"
This reverts commit e29de30.
  • Loading branch information
shuffle2 committed Sep 10, 2013
1 parent 4add0f5 commit 2d492bd
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Source/Core/DolphinWX/Src/Frame.cpp
Expand Up @@ -387,6 +387,10 @@ CFrame::~CFrame()
#if defined(HAVE_XRANDR) && HAVE_XRANDR
delete m_XRRConfig;
#endif

ClosePages();

delete m_Mgr;
}

bool CFrame::RendererIsFullscreen()
Expand Down Expand Up @@ -472,7 +476,6 @@ void CFrame::OnClose(wxCloseEvent& event)
m_LogWindow = NULL;
}

ClosePages();

// Uninit
m_Mgr->UnInit();
Expand Down

0 comments on commit 2d492bd

Please sign in to comment.