ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Allow opening controller settings during netplay.

This commit is contained in:
Admiral H. Curtiss 2022-09-20 14:30:33 +02:00
parent bc47a9a31a
commit 52424fe327
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -360,8 +360,6 @@ void MainWindow::InitCoreCallbacks()
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [this](Core::State state) { connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [this](Core::State state) {
if (state == Core::State::Uninitialized) if (state == Core::State::Uninitialized)
OnStopComplete(); OnStopComplete();
if (state != Core::State::Uninitialized && NetPlay::IsNetPlayRunning() && m_controllers_window)
m_controllers_window->reject();
if (state == Core::State::Running && m_fullscreen_requested) if (state == Core::State::Running && m_fullscreen_requested)
{ {

3
Source/Core/DolphinQt/MenuBar.cpp
View File

@ -131,9 +131,6 @@ void MenuBar::OnEmulationStateChanged(Core::State state)
m_recording_play->setEnabled(m_game_selected && !running); m_recording_play->setEnabled(m_game_selected && !running);
m_recording_start->setEnabled((m_game_selected || running) && !Movie::IsPlayingInput()); m_recording_start->setEnabled((m_game_selected || running) && !Movie::IsPlayingInput());
// Options
m_controllers_action->setEnabled(NetPlay::IsNetPlayRunning() ? !running : true);
// JIT // JIT
m_jit_interpreter_core->setEnabled(running); m_jit_interpreter_core->setEnabled(running);
m_jit_block_linking->setEnabled(!running); m_jit_block_linking->setEnabled(!running);

2
Source/Core/DolphinQt/ToolBar.cpp
View File

@ -61,7 +61,6 @@ void ToolBar::OnEmulationStateChanged(Core::State state)
m_stop_action->setEnabled(running); m_stop_action->setEnabled(running);
m_fullscreen_action->setEnabled(running); m_fullscreen_action->setEnabled(running);
m_screenshot_action->setEnabled(running); m_screenshot_action->setEnabled(running);
m_controllers_action->setEnabled(NetPlay::IsNetPlayRunning() ? !running : true);
bool playing = running && state != Core::State::Paused; bool playing = running && state != Core::State::Paused;
UpdatePausePlayButtonState(playing); UpdatePausePlayButtonState(playing);
@ -130,7 +129,6 @@ void ToolBar::MakeActions()
m_config_action = addAction(tr("Config"), this, &ToolBar::SettingsPressed); m_config_action = addAction(tr("Config"), this, &ToolBar::SettingsPressed);
m_graphics_action = addAction(tr("Graphics"), this, &ToolBar::GraphicsPressed); m_graphics_action = addAction(tr("Graphics"), this, &ToolBar::GraphicsPressed);
m_controllers_action = addAction(tr("Controllers"), this, &ToolBar::ControllersPressed); m_controllers_action = addAction(tr("Controllers"), this, &ToolBar::ControllersPressed);
m_controllers_action->setEnabled(true);
// Ensure every button has about the same width // Ensure every button has about the same width
std::vector<QWidget*> items; std::vector<QWidget*> items;