diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-04-25 01:41:45 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-04-25 01:41:45 +1200 |
| commit | c3dbbe011d4d9e06d6b4badc6e42e830b35fabd2 (patch) | |
| tree | bb57013c56f8e4336d3a81cb28608f663f678fe8 /Source/Core/VideoCommon/Src/MainBase.cpp | |
| parent | e98069b647029417abf6b26d7bd30e0c3ea77863 (diff) | |
| parent | 62ebfa0a78f2cbb8d40d2ae974ee9d404ddf6721 (diff) | |
Merge branch 'master' into wii-network
Diffstat (limited to 'Source/Core/VideoCommon/Src/MainBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/MainBase.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index 1472367f21..1739683562 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -230,9 +230,13 @@ 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"); @@ -255,7 +259,8 @@ void VideoBackendHardware::DoState(PointerWrap& p) } } -void VideoBackendHardware::CheckInvalidState() { +void VideoBackendHardware::CheckInvalidState() +{ if (m_invalid) { m_invalid = false; |