From 5241deaebe2d4b83cb9e00a86d847b5645b6ff0d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 14 Aug 2013 17:50:21 -0400 Subject: NetPlay: Allow hosts to stop the game by closing the game window --- Source/Core/DolphinWX/Src/NetWindow.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/Src/NetWindow.cpp') diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 064e852028..2a545df611 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -432,7 +432,7 @@ void NetPlayDiag::OnStart(wxCommandEvent&) void NetPlayDiag::OnStop(wxCommandEvent&) { - netplay_server->StopGame(); + NetPlay::StopGame(); } void NetPlayDiag::BootGame(const std::string& filename) @@ -661,3 +661,11 @@ void PadMapDiag::OnAdjust(wxCommandEvent& event) for (unsigned int i=0; i<4; ++i) m_mapping[i] = m_map_cbox[i]->GetSelection() - 1; } + +void NetPlay::StopGame() +{ + if (netplay_server != NULL) + netplay_server->StopGame(); + + // TODO: allow non-hosting clients to close the window +} -- cgit v1.2.3