mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-06 12:40:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix wxCommandEvent/wxThreadEvent subclass mismatch

Browse Source 
Regression by 3fed975bac11956ffc4d3eae86c928c7e0c921db caused netplay to
crash on OS X.  While I'm at it, fix the long-standing "unsafe i guess"
AddPendingEvent, since we depend on wx 3 now...
This commit is contained in:
comex 2014-11-15 23:52:19 -05:00
parent 8dbef4e987
commit 37b14bdec9
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinWX/NetWindow.cpp
View File

@ -474,7 +474,7 @@ void NetPlayDiag::StopGame()
// NetPlayUI methods called from ---NETPLAY--- thread // NetPlayUI methods called from ---NETPLAY--- thread
void NetPlayDiag::Update() void NetPlayDiag::Update()
{ {
wxCommandEvent evt(wxEVT_THREAD, 1); wxThreadEvent evt(wxEVT_THREAD, 1);
GetEventHandler()->AddPendingEvent(evt); GetEventHandler()->AddPendingEvent(evt);
} }
@ -487,15 +487,14 @@ void NetPlayDiag::AppendChat(const std::string& msg)
void NetPlayDiag::OnMsgChangeGame(const std::string& filename) void NetPlayDiag::OnMsgChangeGame(const std::string& filename)
{ {
wxCommandEvent evt(wxEVT_THREAD, NP_GUI_EVT_CHANGE_GAME); wxThreadEvent* evt = new wxThreadEvent(wxEVT_THREAD, NP_GUI_EVT_CHANGE_GAME);
// TODO: using a wxString in AddPendingEvent from another thread is unsafe i guess? evt->SetString(StrToWxStr(filename));
evt.SetString(StrToWxStr(filename)); GetEventHandler()->QueueEvent(evt);
GetEventHandler()->AddPendingEvent(evt);
} }
void NetPlayDiag::OnMsgStartGame() void NetPlayDiag::OnMsgStartGame()
{ {
wxCommandEvent evt(wxEVT_THREAD, NP_GUI_EVT_START_GAME); wxThreadEvent evt(wxEVT_THREAD, NP_GUI_EVT_START_GAME);
GetEventHandler()->AddPendingEvent(evt); GetEventHandler()->AddPendingEvent(evt);
if (m_start_btn) if (m_start_btn)
m_start_btn->Disable(); m_start_btn->Disable();
@ -504,7 +503,7 @@ void NetPlayDiag::OnMsgStartGame()
void NetPlayDiag::OnMsgStopGame() void NetPlayDiag::OnMsgStopGame()
{ {
wxCommandEvent evt(wxEVT_THREAD, NP_GUI_EVT_STOP_GAME); wxThreadEvent evt(wxEVT_THREAD, NP_GUI_EVT_STOP_GAME);
GetEventHandler()->AddPendingEvent(evt); GetEventHandler()->AddPendingEvent(evt);
if (m_start_btn) if (m_start_btn)
m_start_btn->Enable(); m_start_btn->Enable();