Fixed some instances where the original OOT save is erroneously prese…

…rved or recreated, leading to another conversion next time you launched the game
HarbourMasters · Jun 26, 2022 · 447e68a · 447e68a
1 parent 0f84682
commit 447e68a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -56,7 +56,6 @@ OTRGlobals::OTRGlobals() {
     context = Ship::GlobalCtx2::CreateInstance("Ship of Harkinian");
     gSaveStateMgr = std::make_shared<SaveStateMgr>();
     context->GetWindow()->Init();
-    CheckSaveFile(SRAM_SIZE);
 }
 
 OTRGlobals::~OTRGlobals() {

diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
@@ -51,6 +51,7 @@ void SaveManager::Init() {
     // If there is a lingering unversioned save, convert it
     if (std::filesystem::exists("oot_save.sav")) {
         ConvertFromUnversioned();
+        std::filesystem::rename("oot_save.sav", "oot_save.bak");
     }
 
     // If the global save file exist, load it. Otherwise, create it.
@@ -1172,8 +1173,6 @@ void SaveManager::ConvertFromUnversioned() {
         }
     }
 
-    std::filesystem::rename("oot_save.sav", "oot_save.bak");
-
 #undef SLOT_SIZE
 #undef SLOT_OFFSET
 }