From d2c7639dd88c2c3ee57e0b2df6d673df69177a7f Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Wed, 27 May 2020 00:41:56 +1000 Subject: [PATCH] System: Update per-game memory cards on load state Prevents saves being written to incorrect card after loading. --- src/core/system.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/system.cpp b/src/core/system.cpp index 9dfe568ad..9efa0da25 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -336,6 +336,9 @@ bool System::DoState(StateWrapper& sw) } UpdateRunningGame(media_filename.c_str(), media.get()); + if (GetSettings().HasAnyPerGameMemoryCards()) + UpdateMemoryCards(); + m_cdrom->Reset(); if (media) m_cdrom->InsertMedia(std::move(media));