summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/MainWindow.cpp
diff options
context:
space:
mode:
authorTechjar <tecknojar@gmail.com>2018-11-23 05:02:00 -0500
committerTechjar <tecknojar@gmail.com>2018-11-29 07:31:45 -0500
commit577f6a5fb1174abfa75ecd2488696bc8eead8aae (patch)
treeb4867b2abb5b50bfb7e8e1ad91452509791f9581 /Source/Core/DolphinQt/MainWindow.cpp
parent1805f51d798113fa839a8f3179360a6e4670c92f (diff)
Qt: Disable controller configuration while NetPlay is running
Doing pretty much anything in the controller config breaks NetPlay (desync and/or deadlock), as saving the settings reconfigures controller interfaces, which NetPlay doesn't expect.
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
-rw-r--r--Source/Core/DolphinQt/MainWindow.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
index 6899508c17..353dbff590 100644
--- a/Source/Core/DolphinQt/MainWindow.cpp
+++ b/Source/Core/DolphinQt/MainWindow.cpp
@@ -275,6 +275,8 @@ void MainWindow::InitCoreCallbacks()
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [=](Core::State state) {
if (state == Core::State::Uninitialized)
OnStopComplete();
+ if (state != Core::State::Uninitialized && NetPlay::IsNetPlayRunning() && m_controllers_window)
+ m_controllers_window->reject();
if (state == Core::State::Running && m_fullscreen_requested)
{