piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a stupid error left by me.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4860 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
ayuanx 2010-01-16 22:37:38 +00:00
parent 4aeec95513
commit 734b0f5dd4
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoCommon/Src/CommandProcessor.cpp
View File

@ -571,7 +571,7 @@ bool AllowIdleSkipping()
// if not then lock CPUThread until GP finish a frame. // if not then lock CPUThread until GP finish a frame.
void WaitForFrameFinish() void WaitForFrameFinish()
{ {
while ((fake_GPWatchdogLastToken == fifo.Fake_GPWDToken) && fifo.bFF_GPReadEnable && ((!fifo.bFF_BPEnable && fifo.CPReadWriteDistance) || (fifo.bFF_BPEnable && !fifo.bFF_Breakpoint))); while ((fake_GPWatchdogLastToken == fifo.Fake_GPWDToken) && fifo.bFF_GPReadEnable && ((!fifo.bFF_BPEnable && fifo.CPReadWriteDistance) || (fifo.bFF_BPEnable && !fifo.bFF_Breakpoint)))
{ {
s_fifoIdleEvent.Wait(); s_fifoIdleEvent.Wait();
} }

4
Source/Core/VideoCommon/Src/Fifo.cpp
View File

@ -97,6 +97,10 @@ void Fifo_ExitLoop()
// Created to allow for self shutdown. // Created to allow for self shutdown.
void Fifo_ExitLoopNonBlocking() void Fifo_ExitLoopNonBlocking()
{ {
// This should break the wait loop in CPU thread
CommandProcessor::fifo.bFF_GPReadEnable = false;
CommandProcessor::SetFifoIdleFromVideoPlugin();
// Terminate GPU thread loop
fifoStateRun = false; fifoStateRun = false;
fifo_run_event.Set(); fifo_run_event.Set();
} }

6
Source/Plugins/Plugin_Wiimote/Src/main.cpp
View File

@ -227,12 +227,12 @@ void Initialize(void *init)
WMdisplay = (Display*)g_WiimoteInitialize.hWnd; WMdisplay = (Display*)g_WiimoteInitialize.hWnd;
#endif #endif
// Load IR settings, as this is a per-game setting and the user might have loaded a different game
g_Config.LoadIR();
g_ISOId = g_WiimoteInitialize.ISOId; g_ISOId = g_WiimoteInitialize.ISOId;
DEBUG_LOG(WIIMOTE, "ISOId: %08x %s", g_WiimoteInitialize.ISOId, Hex2Ascii(g_WiimoteInitialize.ISOId).c_str()); DEBUG_LOG(WIIMOTE, "ISOId: %08x %s", g_WiimoteInitialize.ISOId, Hex2Ascii(g_WiimoteInitialize.ISOId).c_str());
// Load IR settings, as this is a per-game setting and the user might have loaded a different game
g_Config.LoadIR();
// Run this first so that WiiMoteReal::Initialize() overwrites g_Eeprom // Run this first so that WiiMoteReal::Initialize() overwrites g_Eeprom
WiiMoteEmu::Initialize(); WiiMoteEmu::Initialize();

1
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
View File

@ -791,6 +791,7 @@ void PADConfigDialognJoy::CreateGUIControls()
// Create objects for general settings 3 // Create objects for general settings 3
m_gGenSettingsID[i] = new wxStaticBoxSizer( wxVERTICAL, m_Controller[i], wxT("Settings") ); m_gGenSettingsID[i] = new wxStaticBoxSizer( wxVERTICAL, m_Controller[i], wxT("Settings") );
m_CBSaveByID[i] = new wxCheckBox(m_Controller[i], IDC_SAVEBYID, wxT("Save by ID"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_CBSaveByID[i] = new wxCheckBox(m_Controller[i], IDC_SAVEBYID, wxT("Save by ID"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_CBSaveByID[i]->Enable(false);
m_CBShowAdvanced[i] = new wxCheckBox(m_Controller[i], IDC_SHOWADVANCED, wxT("Show advanced settings"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_CBShowAdvanced[i] = new wxCheckBox(m_Controller[i], IDC_SHOWADVANCED, wxT("Show advanced settings"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
// Populate general settings 3 // Populate general settings 3