Movie errors - fix timeline error so that it stops movie if backups are disabled (since it will be unable to restore previous state). Also informs user of the situation.

This commit is contained in:
adelikat 2010-05-28 19:25:42 +00:00
parent 271815d60e
commit c2a9da0adc
1 changed files with 9 additions and 1 deletions

View File

@ -1355,7 +1355,15 @@ bool FCEUMOV_ReadState(EMUFILE* is, uint32 size)
else else
{ {
//Wrong timeline, do apprioriate logic here //Wrong timeline, do apprioriate logic here
FCEU_PrintError("Error: Savestate not in the same timeline as movie!\nFrame %d branches from current timeline", errorFrame);
if (!backupSavestates) //If backups are disabled we can just resume normally since we can't restore so stop movie and inform user
{
FCEU_PrintError("Error: Savestate not in the same timeline as movie!\nFrame %d branches from current timeline\nUnable to restore backup, movie playback stopped.", errorFrame);
FCEUI_StopMovie();
}
else
FCEU_PrintError("Error: Savestate not in the same timeline as movie!\nFrame %d branches from current timeline", errorFrame);
return false; return false;
} }
} }