Only delay DI command replies.

Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp

@@ -405,6 +405,7 @@ void ExecuteCommand(u32 _Address)
 				else
 				{
 					delete pDevice;
+					pDevice = NULL;
 				}
 			}
 
@@ -435,7 +436,10 @@ void ExecuteCommand(u32 _Address)
 
 			// Don't delete hardware
 			if (!pDevice->IsHardware())
+			{
 				delete pDevice;
+				pDevice = NULL;
+			}
 		}
 		else
 		{
@@ -515,8 +519,8 @@ void ExecuteCommand(u32 _Address)
     if (CmdSuccess)
     {
 		// Generate a reply to the IPC command
-		// TODO: should probably figure out which commands need delayed replies and which don't
-		EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 100);
+		int const reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0;
+		EnqReply(_Address, reply_delay);
     }
 	else
 	{

Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h

@@ -95,6 +95,8 @@ public:
 	virtual bool IOCtlV	(u32) { UNIMPLEMENTED_CMD(IOCtlV) }
 #undef UNIMPLEMENTED_CMD
 
+	virtual int GetCmdDelay(u32) { return 0; }
+
 	virtual u32 Update() { return 0; }
 
 	virtual bool IsHardware() { return m_Hardware; }

Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp

@@ -28,6 +28,7 @@
 #include "VolumeCreator.h"
 #include "Filesystem.h"
 #include "LogManager.h"
+#include "../HW/SystemTimers.h"
 
 #include "../../DiscIO/Src/FileMonitor.h"
 
@@ -460,3 +461,8 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
     // i dunno but prolly 1 is okay all the time :)
     return 1;
 }
+
+int CWII_IPC_HLE_Device_di::GetCmdDelay(u32)
+{
+	return SystemTimers::GetTicksPerSecond() / 100;
+}

Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h

@@ -39,6 +39,8 @@ public:
 	bool IOCtl(u32 _CommandAddress); 
 	bool IOCtlV(u32 _CommandAddress);
 	
+	int GetCmdDelay(u32);
+
 private:
 
 	u32 ExecuteCommand(u32 BufferIn, u32 BufferInSize, u32 _BufferOut, u32 BufferOutSize);