From 577f6a5fb1174abfa75ecd2488696bc8eead8aae Mon Sep 17 00:00:00 2001 From: Techjar Date: Fri, 23 Nov 2018 05:02:00 -0500 Subject: 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. --- Source/Core/DolphinQt/MainWindow.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/Core/DolphinQt/MainWindow.cpp') 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) { -- cgit v1.2.3