mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-31 18:32:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

On windows, ignore WM_QUERYENDSESSION and close upon WM_ENDSESSION.

Browse Source 
The messages can come through CFrame::MSWWindowProc and the wxApp implementation, so make sure to catch both.
Fixes issue 6546.
This commit is contained in:
Shawn Hoffman 2013-09-10 03:14:21 -07:00
parent 2d492bdc4f
commit 484130049d
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -539,9 +539,24 @@ void CFrame::OnResize(wxSizeEvent& event)
WXLRESULT CFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
if (WM_SYSCOMMAND == nMsg && (SC_SCREENSAVE == wParam || SC_MONITORPOWER == wParam))
{
return 0;
}
else if (nMsg == WM_QUERYENDSESSION)
{
// Indicate that the application will be able to close
return 1;
}
else if (nMsg == WM_ENDSESSION)
{
// Actually trigger the close now
Close(true);
return 0;
}
else
{
return wxFrame::MSWWindowProc(nMsg, wParam, lParam);
}
}
#endif

11
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -71,6 +71,8 @@ IMPLEMENT_APP(DolphinApp)
BEGIN_EVENT_TABLE(DolphinApp, wxApp)
EVT_TIMER(wxID_ANY, DolphinApp::AfterInit)
EVT_QUERY_END_SESSION(DolphinApp::OnEndSession)
EVT_END_SESSION(DolphinApp::OnEndSession)
END_EVENT_TABLE()
#include <wx/stdpaths.h>
@ -433,6 +435,15 @@ void DolphinApp::InitLanguageSupport()
}
}
void DolphinApp::OnEndSession(wxCloseEvent& event)
{
// Close if we've recieved wxEVT_END_SESSION (ignore wxEVT_QUERY_END_SESSION)
if (!event.CanVeto())
{
main_frame->Close(true);
}
}
int DolphinApp::OnExit()
{
WiimoteReal::Shutdown();

1
Source/Core/DolphinWX/Src/Main.h
View File

@ -33,6 +33,7 @@ private:
wxLocale *m_locale;
void AfterInit(wxTimerEvent& WXUNUSED(event));
void OnEndSession(wxCloseEvent& event);
};
DECLARE_APP(DolphinApp);