From 356439d1e243806c3df0273f23da55ee6d77b315 Mon Sep 17 00:00:00 2001
From: Anthony Stewart <anthony.l.stewart@outlook.com>
Date: Sat, 14 Jun 2025 18:34:13 -0500
Subject: [PATCH] Added IsSaveLoaded guard clause to
 RecalculateAvailableChecks.

---
 soh/soh/Enhancements/debugconsole.cpp                     | 5 +----
 .../Enhancements/randomizer/randomizer_check_tracker.cpp  | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index d25c3cfff..91c0d4c1c 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -1471,10 +1471,7 @@ static bool AvailableChecksProcessUndiscoveredExitsHandler(std::shared_ptr<Ship:
     INFO_MESSAGE("[SOH] Available Checks - Process Undiscovered Exits %s",
                  logic->ACProcessUndiscoveredExits ? "enabled" : "disabled");
 
-    if (GameInteractor::IsSaveLoaded(true)) {
-        CheckTracker::RecalculateAvailableChecks();
-    }
-
+    CheckTracker::RecalculateAvailableChecks();
     return 0;
 }
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 3a2c5e475..679b18129 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -1988,6 +1988,9 @@ void RecalculateAvailableChecks(RandomizerRegion startingRegion /* = RR_ROOT */)
     if (!enableAvailableChecks) {
         return;
     }
+    if (!GameInteractor::IsSaveLoaded(true)) {
+        return;
+    }
 
     ResetPerformanceTimer(PT_RECALCULATE_AVAILABLE_CHECKS);
     StartPerformanceTimer(PT_RECALCULATE_AVAILABLE_CHECKS);
@@ -2135,10 +2138,7 @@ void CheckTrackerSettingsWindow::DrawElement() {
                                                  "with your current progress.")
                                         .Color(THEME_COLOR))) {
             enableAvailableChecks = CVarGetInteger(CVAR_TRACKER_CHECK("EnableAvailableChecks"), 0);
-
-            if (GameInteractor::IsSaveLoaded(true)) {
-                RecalculateAvailableChecks();
-            }
+            RecalculateAvailableChecks();
         }
         ImGui::EndDisabled();