diff options
| author | skidau <skidau@gmail.com> | 2014-09-07 14:05:59 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-09-07 14:05:59 +1000 |
| commit | a21ad12f1e7f232a92225e005a178e9c7e166d47 (patch) | |
| tree | 99e61e183f9bf1343f5f46edff5dc7e209abe099 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 741c0e2d509555a0308b6850e9d0c828bc7cfca9 (diff) | |
| parent | 5a163ec5e6f6fba5f4901f02071042211d6a25eb (diff) | |
Merge pull request #1014 from RachelBryk/active-movie
Add an IsMovieActive function.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index b549a96353..baa25f4f46 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1097,7 +1097,7 @@ void CFrame::DoStop() // TODO: Show the author/description dialog here if (Movie::IsRecordingInput()) DoRecordingSave(); - if (Movie::IsPlayingInput() || Movie::IsRecordingInput()) + if (Movie::IsMovieActive()) Movie::EndPlayInput(false); NetPlay::StopGame(); @@ -1644,7 +1644,7 @@ void CFrame::UpdateGUI() GetMenuBar()->FindItem(IDM_RESET)->Enable(Running || Paused); GetMenuBar()->FindItem(IDM_RECORD)->Enable(!Movie::IsRecordingInput()); GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(!Initialized); - GetMenuBar()->FindItem(IDM_RECORDEXPORT)->Enable(Movie::IsPlayingInput() || Movie::IsRecordingInput()); + GetMenuBar()->FindItem(IDM_RECORDEXPORT)->Enable(Movie::IsMovieActive()); GetMenuBar()->FindItem(IDM_FRAMESTEP)->Enable(Running || Paused); GetMenuBar()->FindItem(IDM_SCREENSHOT)->Enable(Running || Paused); GetMenuBar()->FindItem(IDM_TOGGLE_FULLSCREEN)->Enable(Running || Paused); |