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

Whoops, was calling GetMD5() twice.

This commit is contained in:
rog 2012-11-26 12:29:36 -05:00
parent 3d9712a99e
commit 38e0d06e8c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Src/Movie.cpp
View File

@ -166,7 +166,9 @@ void Init()
if (IsRecordingInput()) if (IsRecordingInput())
{ {
GetSettings(); GetSettings();
std::thread md5thread(GetMD5);
} }
g_frameSkipCounter = g_framesToSkip; g_frameSkipCounter = g_framesToSkip;
memset(&g_padState, 0, sizeof(g_padState)); memset(&g_padState, 0, sizeof(g_padState));
if (!tmpHeader.bFromSaveState || !IsPlayingInput()) if (!tmpHeader.bFromSaveState || !IsPlayingInput())
@ -417,6 +419,7 @@ bool BeginRecordingInput(int controllers)
else else
Movie::g_bClearSave = true; Movie::g_bClearSave = true;
} }
std::thread md5thread(GetMD5);
} }
g_playMode = MODE_RECORDING; g_playMode = MODE_RECORDING;
GetSettings(); GetSettings();
@ -1155,7 +1158,6 @@ void GetSettings()
if (!Core::g_CoreStartupParameter.bWii) if (!Core::g_CoreStartupParameter.bWii)
g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD; bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD;
std::thread md5thread(GetMD5);
} }
void CheckMD5() void CheckMD5()
@ -1172,7 +1174,7 @@ void CheckMD5()
unsigned char gameMD5[16]; unsigned char gameMD5[16];
char game[255]; char game[255];
memcpy(game, SConfig::GetInstance().m_LastFilename.c_str(), SConfig::GetInstance().m_LastFilename.size()); memcpy(game, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(), SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.size());
md5_file(game, gameMD5); md5_file(game, gameMD5);
if (memcmp(gameMD5,MD5,16) == 0) if (memcmp(gameMD5,MD5,16) == 0)
@ -1187,7 +1189,7 @@ void GetMD5()
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
MD5[i] = 0; MD5[i] = 0;
char game[255]; char game[255];
memcpy(game, SConfig::GetInstance().m_LastFilename.c_str(), SConfig::GetInstance().m_LastFilename.size()); memcpy(game, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(),SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.size());
md5_file(game, MD5); md5_file(game, MD5);
Core::DisplayMessage("Finished calculating checksum.", 2000); Core::DisplayMessage("Finished calculating checksum.", 2000);
} }