From b2d5108d909cce14dd307547bd7d427e9a83f5c8 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Thu, 20 Sep 2012 13:25:34 +0300 Subject: [PATCH] Fix desync on loading savestate in readonly mode after movie --- src/core/moviedata.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/moviedata.cpp b/src/core/moviedata.cpp index 0fc222d9..f8e0e02a 100644 --- a/src/core/moviedata.cpp +++ b/src/core/moviedata.cpp @@ -416,6 +416,10 @@ void do_load_state(struct moviefile& _movie, int lmode) //Okay, copy the movie data. if(lmode != LOAD_STATE_PRESERVE) our_movie = _movie; + else { + //The is_savestate MUST be taken from movie (except LOAD_STATE_MOVIE), or one gets desyncs. + our_movie.is_savestate = _movie.is_savestate; + } if(!our_movie.is_savestate || lmode == LOAD_STATE_MOVIE) { our_movie.is_savestate = false; our_movie.host_memory.clear(); -- 2.11.4.GIT