Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DolphinQt: Fix the enabling/disabling of Movie items even more #8314

Merged
merged 1 commit into from
Aug 21, 2019
Merged

DolphinQt: Fix the enabling/disabling of Movie items even more #8314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
DolphinQt: Fix the enabling/disabling of Movie items even more 
Play can only be used when a game is selected and emulation is not
running. Start can be used when a game is selected (to start from
cold boot) or when emulation is running (to start from a savestate).

https://bugs.dolphin-emu.org/issues/11826
  • Loading branch information
@JosJuice
JosJuice committed Aug 14, 2019
commit a66ca85dd5bb219193cca8ebf3ce2f747bd62ae0
11 changes: 6 additions & 5 deletions Source/Core/DolphinQt/MenuBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ void MenuBar::OnEmulationStateChanged(Core::State state)
m_recording_stop->setEnabled(false);
m_recording_export->setEnabled(false);
}
m_recording_play->setEnabled(!running);
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);
Expand Down Expand Up @@ -1109,15 +1110,15 @@ void MenuBar::NANDExtractCertificates()

void MenuBar::OnSelectionChanged(std::shared_ptr<const UICommon::GameFile> game_file)
{
const bool game_selected = !!game_file;
m_game_selected = !!game_file;

m_recording_play->setEnabled(game_selected && !Core::IsRunning());
m_recording_start->setEnabled(game_selected && !Movie::IsPlayingInput());
m_recording_play->setEnabled(m_game_selected && !Core::IsRunning());
m_recording_start->setEnabled((m_game_selected || Core::IsRunning()) && !Movie::IsPlayingInput());
}

void MenuBar::OnRecordingStatusChanged(bool recording)
{
m_recording_start->setEnabled(!recording);
m_recording_start->setEnabled(!recording && (m_game_selected || Core::IsRunning()));
m_recording_stop->setEnabled(recording);
m_recording_export->setEnabled(recording);
}
Expand Down
2 changes: 2 additions & 0 deletions Source/Core/DolphinQt/MenuBar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,4 +259,6 @@ class MenuBar final : public QMenuBar
QAction* m_jit_paired_off;
QAction* m_jit_systemregisters_off;
QAction* m_jit_branch_off;

bool m_game_selected = false;
};