Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
lioncash committed May 1, 2013
1 parent 2c7ed2a commit 62065be
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
Expand Up @@ -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);
Expand Down Expand Up @@ -65,7 +65,7 @@ FifoPlayerDlg::~FifoPlayerDlg()

FifoPlayer::GetInstance().SetFrameWrittenCallback(NULL);

sMutex.lock();
sMutex.lock();
m_EvtHandler = NULL;
sMutex.unlock();
}
Expand Down Expand Up @@ -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
{
Expand Down

0 comments on commit 62065be

Please sign in to comment.