From c2a9da0adc492cd8692566dc40e5d9e93b5d1e43 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 28 May 2010 19:25:42 +0000 Subject: [PATCH] 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. --- src/movie.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/movie.cpp b/src/movie.cpp index f5e5be27..b878db08 100644 --- a/src/movie.cpp +++ b/src/movie.cpp @@ -1355,7 +1355,15 @@ bool FCEUMOV_ReadState(EMUFILE* is, uint32 size) else { //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; } }