Probably breaks a "fixed" issue..

dolphin-emu · Apr 24, 2013 · 62ebfa0 · 62ebfa0
1 parent 8da425b
commit 62ebfa0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Source/Core/Core/Src/HW/WII_IPC.cpp b/Source/Core/Core/Src/HW/WII_IPC.cpp
@@ -213,7 +213,7 @@ void Write32(const u32 _Value, const u32 _Address)
 		break;
 	}	
 
-	WII_IPC_HLE_Interface::Update();
+	//WII_IPC_HLE_Interface::Update();
 	CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0);
 }
 

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
@@ -80,7 +80,6 @@ void EnqueReplyCallback(u64 userdata, int)
 
 void Init()
 {
-	enque_reply = CoreTiming::RegisterEvent("IPCReply", EnqueReplyCallback);
 
 	_dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isn't empty on init");
 	CWII_IPC_HLE_Device_es::m_ContentFile = "";
@@ -116,11 +115,15 @@ void Init()
 	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/hid")); i++;
 	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/oh1")); i++;
 	g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, std::string("_Unimplemented_Device_")); i++;
+
+	enque_reply = CoreTiming::RegisterEvent("IPCReply", EnqueReplyCallback);
 }
 
 void Reset(bool _bHard)
 {
-
+
+	CoreTiming::RemoveAllEvents(enque_reply);
+
 	u32 i;
 	for (i=0; i<IPC_MAX_FDS; i++)
 	{