summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Frame.cpp
diff options
context:
space:
mode:
authorMichael Maltese <michaeljosephmaltese@gmail.com>2016-12-06 16:39:04 -0800
committerMichael Maltese <michaeljosephmaltese@gmail.com>2017-01-04 14:06:31 -0800
commit443815df166f3460f9c9f211f4b597d52b8bbd72 (patch)
tree882c1e0f8f6da52b3c2e8c9eba5faf953aff874a /Source/Core/DolphinWX/Frame.cpp
parent389f8297c3bb1829cf7c62f5461457f4d4c501bc (diff)
DolphinWX: pass wxMsgAlert to main thread on non-GTK too
Fixes an issue on macOS where wxMessageBox always returns wxCANCEL when not called from main thread.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 200b495a11..8a83d4f223 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -701,7 +701,6 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
m_RenderParent->SetCursor(wxCURSOR_BLANK);
break;
-#ifdef __WXGTK__
case IDM_PANIC:
{
wxString caption = event.GetString().BeforeFirst(':');
@@ -711,7 +710,6 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
panic_event.Set();
}
break;
-#endif
case WM_USER_STOP:
DoStop();