From 1ee295f6de56994775cfe3f4771d2066bfaf7fc7 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Wed, 29 May 2013 20:20:10 +0300 Subject: [PATCH] Unconditionally reload RTC state on loadstate --- src/core/moviedata.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/moviedata.cpp b/src/core/moviedata.cpp index 0f10f540..e0415777 100644 --- a/src/core/moviedata.cpp +++ b/src/core/moviedata.cpp @@ -431,8 +431,10 @@ void do_load_state(struct moviefile& _movie, int lmode) 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. + //Some fields MUST be taken from movie or one gets desyncs. our_movie.is_savestate = _movie.is_savestate; + our_movie.rtc_second = _movie.rtc_second; + our_movie.rtc_subsecond = _movie.rtc_subsecond; } if(!our_movie.is_savestate || lmode == LOAD_STATE_MOVIE) { our_movie.is_savestate = false;