diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2013-09-02 21:54:28 -0400 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2013-09-02 21:54:28 -0400 |
| commit | cea7737aefa2afc6083a14f404c807dc2add894f (patch) | |
| tree | 0cbb9bd90e55cbecaadd59b06be693bbe9402591 /Source/Core/DolphinWX/Src/NetWindow.cpp | |
| parent | 6b1c8f9d17ca7a3e368f9fafeaa8d5d3c729e5b8 (diff) | |
Fix crash on stop in netplay, and stop netplay when anyone with a pad mapped in game stops emulation.
Diffstat (limited to 'Source/Core/DolphinWX/Src/NetWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/NetWindow.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index f962b58590..a31f9c1cb1 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -650,8 +650,6 @@ void PadMapDiag::OnAdjust(wxCommandEvent& event) void NetPlay::StopGame() { - if (netplay_server != NULL) - netplay_server->StopGame(); - - // TODO: allow non-hosting clients to close the window + if (netplay_client != NULL) + netplay_client->Stop(); } |