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 #562 from RachelBryk/load-input-fixes 

End movie play back immediately if g_currentByte > g_totalBytes.
This commit is contained in:
Lioncash 2014-07-05 20:03:17 -04:00
parent 0b74ad1b20 86ccf13c09
commit 0ede10e38d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Movie.cpp
View File

@ -822,9 +822,10 @@ void LoadInput(const std::string& filename)
u64 totalSavedBytes = t_record.GetSize() - 256; u64 totalSavedBytes = t_record.GetSize() - 256;
bool afterEnd = false; bool afterEnd = false;
// This can only happen if the user manually deletes data from the dtm.
if (g_currentByte > totalSavedBytes) if (g_currentByte > totalSavedBytes)
{ {
//PanicAlertT("Warning: You loaded a save whose movie ends before the current frame in the save (byte %u < %u) (frame %u < %u). You should load another save before continuing.", (u32)totalSavedBytes+256, (u32)g_currentByte+256, (u32)tmpHeader.frameCount, (u32)g_currentFrame); PanicAlertT("Warning: You loaded a save whose movie ends before the current frame in the save (byte %u < %u) (frame %u < %u). You should load another save before continuing.", (u32)totalSavedBytes+256, (u32)g_currentByte+256, (u32)tmpHeader.frameCount, (u32)g_currentFrame);
afterEnd = true; afterEnd = true;
} }
@ -846,6 +847,7 @@ void LoadInput(const std::string& filename)
} }
else if (g_currentByte > g_totalBytes) else if (g_currentByte > g_totalBytes)
{ {
afterEnd = true;
PanicAlertT("Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off.", (u32)g_currentByte+256, (u32)g_totalBytes+256, (u32)g_currentFrame, (u32)g_totalFrames); PanicAlertT("Warning: You loaded a save that's after the end of the current movie. (byte %u > %u) (frame %u > %u). You should load another save before continuing, or load this state with read-only mode off.", (u32)g_currentByte+256, (u32)g_totalBytes+256, (u32)g_currentFrame, (u32)g_totalFrames);
} }
else if (g_currentByte > 0 && g_totalBytes > 0) else if (g_currentByte > 0 && g_totalBytes > 0)