diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-04-11 01:24:45 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-04-11 01:35:54 -0400 |
| commit | bd28d260cefe86f8e0cd914f73c94b9043f94e68 (patch) | |
| tree | 664afa47440e9a16e1f76ff6d30f51023cc55c8f /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 1a18cad178b65c4f339982e3db451763e1425c45 (diff) | |
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 de41814259..5c67dc4c3d 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 { |