summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorXTra.KrazzY <XTra.KrazzY@gmail.com>2010-06-14 12:18:01 +0000
committerXTra.KrazzY <XTra.KrazzY@gmail.com>2010-06-14 12:18:01 +0000
commitff50fd188fa82004bea7550fbf1b78903254190d (patch)
tree585126a602fbd77f2f222916166498e0c950cc6c /Source
parenta0f1797e46014c4134930895d873727fcc117d66 (diff)
Reverted even more of r5681. Now games don't hang
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5690 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/Src/HW/SystemTimers.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp
index c1b5be46fe..8482d30966 100644
--- a/Source/Core/Core/Src/HW/SystemTimers.cpp
+++ b/Source/Core/Core/Src/HW/SystemTimers.cpp
@@ -282,7 +282,7 @@ void Init()
et_AudioDMA = CoreTiming::RegisterEvent("AudioDMACallback", AudioDMACallback);
et_IPC_HLE = CoreTiming::RegisterEvent("IPC_HLE_UpdateCallback", IPC_HLE_UpdateCallback);
// Always register this. Increases chances of DC/SC save state compatibility.
-// et_FakeGPWD = CoreTiming::RegisterEvent("FakeGPWatchdogCallback", FakeGPWatchdogCallback);
+ et_FakeGPWD = CoreTiming::RegisterEvent("FakeGPWatchdogCallback", FakeGPWatchdogCallback);
et_PatchEngine = CoreTiming::RegisterEvent("PatchEngine", PatchEngineCallback);
CoreTiming::ScheduleEvent(AI_PERIOD, et_AI);
@@ -292,8 +292,8 @@ void Init()
CoreTiming::ScheduleEvent(AUDIO_DMA_PERIOD, et_AudioDMA);
// For DC watchdog hack
-// if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
-// CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame(), et_FakeGPWD);
+ if (SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
+ CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame(), et_FakeGPWD);
CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerFrame(), et_PatchEngine);