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

Thanks to godisgovernment's sharp eyes, now the Reset() bug in WII_IPC_HLE is fixed 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4628 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
ayuanx 2009-11-29 06:14:28 +00:00
parent 988fabeb70
commit 4ce110e841
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -103,27 +103,19 @@ void Init()
g_LastDeviceID = IPC_FIRST_FILEIO_ID;
}
void Reset(bool _hard)
void Reset(bool _bHard)
{
TDeviceMap::const_iterator itr = g_DeviceMap.begin();
while (itr != g_DeviceMap.end())
{
if (itr->second)
{
if (_hard||(!itr->second->IsHardware()))
{
// Hardware should not be deleted unless it is a hard reset
delete itr->second;
g_DeviceMap.erase(itr->first);
}
}
else
{
// Erase invalid device
g_DeviceMap.erase(itr->first);
}
// Hardware should not be deleted unless it is a hard reset
if (_bHard || !itr->second->IsHardware())
delete itr->second;
++itr;
}
// Erase invalid device
itr = g_DeviceMap.find((_bHard)? IPC_FIRST_HARDWARE_ID : IPC_FIRST_FILEIO_ID);
g_DeviceMap.erase(itr, g_DeviceMap.end());
g_FileNameMap.clear();
g_LastDeviceID = IPC_FIRST_FILEIO_ID;

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h
View File

@ -35,7 +35,7 @@ void Init();
void Shutdown();
// Reset
void Reset(bool _hard = false);
void Reset(bool _bHard = false);
// Do State
void DoState(PointerWrap &p);