diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 0e833a7d2c..df7e7371ac 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -360,8 +360,6 @@ void MainWindow::InitCoreCallbacks() connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [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) { diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp index e1737f79d3..f901f3e726 100644 --- a/Source/Core/DolphinQt/MenuBar.cpp +++ b/Source/Core/DolphinQt/MenuBar.cpp @@ -131,9 +131,6 @@ void MenuBar::OnEmulationStateChanged(Core::State state) m_recording_play->setEnabled(m_game_selected && !running); m_recording_start->setEnabled((m_game_selected || running) && !Movie::IsPlayingInput()); - // Options - m_controllers_action->setEnabled(NetPlay::IsNetPlayRunning() ? !running : true); - // JIT m_jit_interpreter_core->setEnabled(running); m_jit_block_linking->setEnabled(!running); diff --git a/Source/Core/DolphinQt/ToolBar.cpp b/Source/Core/DolphinQt/ToolBar.cpp index ad79c6f91a..49f384848d 100644 --- a/Source/Core/DolphinQt/ToolBar.cpp +++ b/Source/Core/DolphinQt/ToolBar.cpp @@ -61,7 +61,6 @@ void ToolBar::OnEmulationStateChanged(Core::State state) m_stop_action->setEnabled(running); m_fullscreen_action->setEnabled(running); m_screenshot_action->setEnabled(running); - m_controllers_action->setEnabled(NetPlay::IsNetPlayRunning() ? !running : true); bool playing = running && state != Core::State::Paused; UpdatePausePlayButtonState(playing); @@ -130,7 +129,6 @@ void ToolBar::MakeActions() m_config_action = addAction(tr("Config"), this, &ToolBar::SettingsPressed); m_graphics_action = addAction(tr("Graphics"), this, &ToolBar::GraphicsPressed); m_controllers_action = addAction(tr("Controllers"), this, &ToolBar::ControllersPressed); - m_controllers_action->setEnabled(true); // Ensure every button has about the same width std::vector items;