summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/MainBase.cpp
diff options
context:
space:
mode:
authorRachel Bryk <RachelBryk@gmail.com>2013-02-28 13:36:29 -0500
committerRachel Bryk <RachelBryk@gmail.com>2013-02-28 13:36:29 -0500
commit0c16489c391174975121683ec334b261f56e4ccc (patch)
tree4b75ba2af4723a35c4747e0df7657c3ba79a7069 /Source/Core/VideoCommon/Src/MainBase.cpp
parent07539b9a3ff1bc55bd829d0098ac025dbfd4ad44 (diff)
parent46f5c19c6d2fbd3318e9a6de3c3c2e313c669cf0 (diff)
Merge branch 'VideoSoftware-savestates'
Diffstat (limited to 'Source/Core/VideoCommon/Src/MainBase.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/MainBase.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp
index 726ef71b38..a881bebfb2 100644
--- a/Source/Core/VideoCommon/Src/MainBase.cpp
+++ b/Source/Core/VideoCommon/Src/MainBase.cpp
@@ -186,6 +186,11 @@ void VideoBackendHardware::InitializeShared()
// Run from the CPU thread
void VideoBackendHardware::DoState(PointerWrap& p)
{
+ bool software = false;
+ p.Do(software);
+ if (p.GetMode() == PointerWrap::MODE_READ && software == true)
+ // change mode to abort load of incompatible save state.
+ p.SetMode(PointerWrap::MODE_VERIFY);
VideoCommon_DoState(p);
p.DoMarker("VideoCommon");