ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3255 from mickdermack/pr-hidrace 

Fix a race condition on shutdown between Memory and CWII_IPC_HLE_Device_hid
This commit is contained in:
Scott Mansell 2015-11-13 23:54:33 +13:00
parent a498c684a2 3cbed527c2
commit 19e3fba59f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/HW/HW.cpp
View File

@ -56,28 +56,28 @@ namespace HW
DiscIO::cUIDsys::AccessInstance().UpdateLocation(); DiscIO::cUIDsys::AccessInstance().UpdateLocation();
DiscIO::CSharedContent::AccessInstance().UpdateLocation(); DiscIO::CSharedContent::AccessInstance().UpdateLocation();
WII_IPCInterface::Init(); WII_IPCInterface::Init();
WII_IPC_HLE_Interface::Init(); WII_IPC_HLE_Interface::Init(); // Depends on Memory
} }
} }
void Shutdown() void Shutdown()
{ {
if (SConfig::GetInstance().bWii)
{
WII_IPC_HLE_Interface::Shutdown(); // Depends on Memory
WII_IPCInterface::Shutdown();
Common::ShutdownWiiRoot();
}
SystemTimers::Shutdown(); SystemTimers::Shutdown();
CPU::Shutdown(); CPU::Shutdown();
ExpansionInterface::Shutdown();
DVDInterface::Shutdown(); DVDInterface::Shutdown();
DSP::Shutdown(); DSP::Shutdown();
Memory::Shutdown(); Memory::Shutdown();
ExpansionInterface::Shutdown();
SerialInterface::Shutdown(); SerialInterface::Shutdown();
AudioInterface::Shutdown(); AudioInterface::Shutdown();
if (SConfig::GetInstance().bWii)
{
WII_IPCInterface::Shutdown();
WII_IPC_HLE_Interface::Shutdown();
Common::ShutdownWiiRoot();
}
State::Shutdown(); State::Shutdown();
CoreTiming::Shutdown(); CoreTiming::Shutdown();
} }