From 1aafbe1a6202523b69b8743b21ff26765eeef8b1 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 25 May 2010 00:50:27 +0000 Subject: [PATCH] Fixed so that Play movie from beginning has no affect on a movie that starts from a savestate rather than attempting to and using a power cycle to do it. TODO: properly replay a movie from beginning that starts from savestate. --- src/movie.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/movie.cpp b/src/movie.cpp index e0e4572c..eb45ba42 100644 --- a/src/movie.cpp +++ b/src/movie.cpp @@ -1486,13 +1486,14 @@ void FCEUI_MoviePlayFromBeginning(void) { if (movieMode != MOVIEMODE_INACTIVE && movieMode != MOVIEMODE_TASEDIT) { - movie_readonly=true; - poweron(true); - - currFrameCounter=0; - movieMode = MOVIEMODE_PLAY; - - FCEU_DispMessage("Movie is now Read-Only. Playing from beginning.",0); + if (currMovieData.savestate.empty()) + { + movie_readonly=true; + poweron(true); //Bad, this assumes a movie doesn't start from savestate + currFrameCounter=0; + movieMode = MOVIEMODE_PLAY; + FCEU_DispMessage("Movie is now Read-Only. Playing from beginning.",0); + } } }