summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorlioncash <mathew1900@hotmail.com>2013-05-01 09:05:37 -0400
committerlioncash <mathew1900@hotmail.com>2013-05-01 09:05:37 -0400
commit62065be7889d9dceba3d16e10674ac34abc65f38 (patch)
tree61eaaf5440ae6e7ee6f9ed5f7f055875b549ee45 /Source/Core
parent2c7ed2a793c1c75cf68e051d1171ebf0a6425c46 (diff)
Fix a bug where FIFO recording could not work.
Example (in step by step explanation): 1. Run Dolphin. 2. Go to Tools -> Fifo Player 3. Go to the Record tab and hit record and then stop without a game loaded. The button is now disabled and will not become active again for the whole time that Dolphin is running. Dolphin must be closed and then re-opened in order to use it again. This fixes that. I've tested it with multiple conditions to make sure this doesn't beef anything else related to the Fifo Player. ie) - Record then Stop without a game loaded (multiple times) - Record then Stop with a game loaded (multiple times, as well as testing playback. All of which work fine).
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
index 8b22166a81..8f14797fb0 100644
--- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
+++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
@@ -34,8 +34,8 @@ FifoPlayerDlg::FifoPlayerDlg(wxWindow * const parent) :
{
CreateGUIControls();
- sMutex.lock();
- m_EvtHandler = GetEventHandler();
+ sMutex.lock();
+ m_EvtHandler = GetEventHandler();
sMutex.unlock();
FifoPlayer::GetInstance().SetFileLoadedCallback(FileLoaded);
@@ -65,7 +65,7 @@ FifoPlayerDlg::~FifoPlayerDlg()
FifoPlayer::GetInstance().SetFrameWrittenCallback(NULL);
- sMutex.lock();
+ sMutex.lock();
m_EvtHandler = NULL;
sMutex.unlock();
}
@@ -407,8 +407,8 @@ void FifoPlayerDlg::OnRecordStop(wxCommandEvent& WXUNUSED(event))
// Then stop recording
recorder.StopRecording();
- // and disable the button to stop recording
- m_RecordStop->Disable();
+ // and change the button label accordingly.
+ m_RecordStop->SetLabel(_("Record"));
}
else // Recorder is actually about to start recording
{