From 822acf9ab9bc9bbec7cccd0d555cf45a0c0f17a8 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 11 Apr 2019 18:50:15 +0200 Subject: [PATCH] IOS/FS: Don't savestate m_root_path The NAND root path can be different on different systems, so we must not savestate it. --- Source/Core/Core/IOS/FS/HostBackend/FS.cpp | 2 -- Source/Core/Core/State.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp index 9f7b6a811b..345800f5a5 100644 --- a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp +++ b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp @@ -53,8 +53,6 @@ HostFileSystem::~HostFileSystem() = default; void HostFileSystem::DoState(PointerWrap& p) { - p.Do(m_root_path); - // Temporarily close the file, to prevent any issues with the savestating of /tmp for (Handle& handle : m_handles) handle.host_file.reset(); diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index 28bf23d3dd..5063f9ed9a 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -74,7 +74,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 = 105; // Last changed in PR 7871 +static const u32 STATE_VERSION = 106; // Last changed in PR 7984 // Maps savestate versions to Dolphin versions. // Versions after 42 don't need to be added to this list,