diff options
| author | skidau <skidau@gmail.com> | 2015-04-16 12:35:41 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-04-16 12:35:41 +1000 |
| commit | 7063886520d51d595ddeb8473889b532dd50753e (patch) | |
| tree | fc3878da07f7a780e8f7d4cb6bfec918617b218c /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | f0593095b412dbeb81122f6894ab2f259fa413b8 (diff) | |
| parent | bd28d260cefe86f8e0cd914f73c94b9043f94e68 (diff) | |
Merge pull request #2289 from lioncash/netplay
DolphinWX: Break the netplay UI controls into separate classes.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 4edb08980f..cf705cbd1d 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -75,7 +75,6 @@ #include "DolphinWX/ISOFile.h" #include "DolphinWX/LogWindow.h" #include "DolphinWX/MemcardManager.h" -#include "DolphinWX/NetWindow.h" #include "DolphinWX/TASInputDlg.h" #include "DolphinWX/WXInputBase.h" #include "DolphinWX/WxUtils.h" @@ -84,6 +83,8 @@ #include "DolphinWX/Debugger/BreakpointWindow.h" #include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/WatchWindow.h" +#include "DolphinWX/NetPlay/NetPlaySetupFrame.h" +#include "DolphinWX/NetPlay/NetWindow.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" @@ -1213,7 +1214,9 @@ void CFrame::DoStop() DoRecordingSave(); if (Movie::IsMovieActive()) Movie::EndPlayInput(false); - NetPlay::StopGame(); + + if (NetPlayDialog::GetNetPlayClient()) + NetPlayDialog::GetNetPlayClient()->Stop(); BootManager::Stop(); UpdateGUI(); @@ -1450,10 +1453,10 @@ void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event)) { if (!g_NetPlaySetupDiag) { - if (NetPlayDiag::GetInstance() != nullptr) - NetPlayDiag::GetInstance()->Raise(); + if (NetPlayDialog::GetInstance() != nullptr) + NetPlayDialog::GetInstance()->Raise(); else - g_NetPlaySetupDiag = new NetPlaySetupDiag(this, m_GameListCtrl); + g_NetPlaySetupDiag = new NetPlaySetupFrame(this, m_GameListCtrl); } else { |