mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-27 06:48:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DolphinWX: Break the netplay UI controls into separate classes.

Browse source
This commit is contained in:
Lioncash 2015-04-11 01:24:45 -04:00
parent 1a18cad178
commit bd28d260ce
14 changed files with 1284 additions and 1167 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/Core/DolphinWX/FrameTools.cpp
View file

@ -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
{