From 620d08002c33ac6b1c70c4f1726de710ba06488c Mon Sep 17 00:00:00 2001
From: xxAtrain223 <xxAtrain223@users.noreply.github.com>
Date: Sun, 15 Jun 2025 12:22:03 -0500
Subject: [PATCH] RecalculateAvailableChecks Fix - IsSaveLoaded Guard (#5587)

* Added IsSaveLoaded guard clause to RecalculateAvailableChecks.

* Combined RecalculateAvailableChecks guard clauses.
---
 soh/soh/Enhancements/debugconsole.cpp                      | 5 +----
 .../Enhancements/randomizer/randomizer_check_tracker.cpp   | 7 ++-----
 2 files changed, 3 insertions(+), 9 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..887bc3731 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -1985,7 +1985,7 @@ void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName,
 }
 
 void RecalculateAvailableChecks(RandomizerRegion startingRegion /* = RR_ROOT */) {
-    if (!enableAvailableChecks) {
+    if (!enableAvailableChecks || !GameInteractor::IsSaveLoaded(true)) {
         return;
     }
 
@@ -2135,10 +2135,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();