summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorMichael Ehrenreich <michideep@gmail.com>2015-11-12 22:11:59 +0100
committerMichael Ehrenreich <michideep@gmail.com>2015-11-13 10:43:59 +0100
commit3cbed527c2ee7f20dc78a7467d970530d4e302d1 (patch)
treedf372e431955e9a4a913fbeffa355d40d08c2a5f /Source/Core
parent8924980b49968604d46655321c49fdd7da20384e (diff)
Shut down HW in reverse initialization order
Fixes a race condition between Memory and CWII_IPC_HLE_Device_hid
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/HW.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp
index b9ae3c6068..c15cdeb7e2 100644
--- a/Source/Core/Core/HW/HW.cpp
+++ b/Source/Core/Core/HW/HW.cpp
@@ -56,28 +56,28 @@ namespace HW
DiscIO::cUIDsys::AccessInstance().UpdateLocation();
DiscIO::CSharedContent::AccessInstance().UpdateLocation();
WII_IPCInterface::Init();
- WII_IPC_HLE_Interface::Init();
+ WII_IPC_HLE_Interface::Init(); // Depends on Memory
}
}
void Shutdown()
{
+ if (SConfig::GetInstance().bWii)
+ {
+ WII_IPC_HLE_Interface::Shutdown(); // Depends on Memory
+ WII_IPCInterface::Shutdown();
+ Common::ShutdownWiiRoot();
+ }
+
SystemTimers::Shutdown();
CPU::Shutdown();
- ExpansionInterface::Shutdown();
DVDInterface::Shutdown();
DSP::Shutdown();
Memory::Shutdown();
+ ExpansionInterface::Shutdown();
SerialInterface::Shutdown();
AudioInterface::Shutdown();
- if (SConfig::GetInstance().bWii)
- {
- WII_IPCInterface::Shutdown();
- WII_IPC_HLE_Interface::Shutdown();
- Common::ShutdownWiiRoot();
- }
-
State::Shutdown();
CoreTiming::Shutdown();
}