Merge pull request #4341 from degasus/syncgpufix

SyncGPU: Fix savestate.
dolphin-emu · Oct 12, 2016 · b15bcc6 · b15bcc6
2 parents 7d5363f + 22681ad
commit b15bcc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
@@ -71,7 +71,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
 static std::thread g_save_thread;
 
 // Don't forget to increase this after doing changes on the savestate system
-static const u32 STATE_VERSION = 63;  // Last changed in PR 4322
+static const u32 STATE_VERSION = 64;  // Last changed in PR 4341
 
 // Maps savestate versions to Dolphin versions.
 // Versions after 42 don't need to be added to this list,

diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp
@@ -85,6 +85,7 @@ void DoState(PointerWrap& p)
   }
 
   p.Do(s_sync_ticks);
+  p.Do(s_syncing_suspended);
 }
 
 void PauseAndLock(bool doLock, bool unpauseOnUnlock)