piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-08 14:59:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

WII_IPC: Fix reregistering CoreTiming callback multiple times.

Browse Source 
Separate state reset from Init().
This commit is contained in:
EmptyChaos
2016-09-03 04:54:34 +00:00
parent 17c34ae0b1
commit f15e4fb35e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/HW/WII_IPC.cpp
View File

@ -113,7 +113,7 @@ void DoState(PointerWrap& p)
p.Do(sensorbar_power); p.Do(sensorbar_power);
} }
void Init() static void InitState()
{ {
ctrl = CtrlRegister(); ctrl = CtrlRegister();
ppc_msg = 0; ppc_msg = 0;
@ -127,14 +127,18 @@ void Init()
sensorbar_power = 0; sensorbar_power = 0;
ppc_irq_masks |= INT_CAUSE_IPC_BROADWAY; ppc_irq_masks |= INT_CAUSE_IPC_BROADWAY;
}
void Init()
{
InitState();
updateInterrupts = CoreTiming::RegisterEvent("IPCInterrupt", UpdateInterrupts); updateInterrupts = CoreTiming::RegisterEvent("IPCInterrupt", UpdateInterrupts);
} }
void Reset() void Reset()
{ {
INFO_LOG(WII_IPC, "Resetting ..."); INFO_LOG(WII_IPC, "Resetting ...");
Init(); InitState();
WII_IPC_HLE_Interface::Reset(); WII_IPC_HLE_Interface::Reset();
} }