From 82c5caa46002b8d6a397d0577521947d0c643430 Mon Sep 17 00:00:00 2001
From: sonoftunk <sonoftunk@gmail.com>
Date: Wed, 23 Nov 2022 07:40:40 -0500
Subject: [PATCH] Check Tracker - Fixes duplicated checks when using Only on
 Pause or Only on Combo

---
 .../randomizer/randomizer_check_tracker.cpp            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index 233c0bd94..165df29e5 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -93,7 +93,11 @@ void DrawCheckTracker(bool& open) {
 
     if (doInitialize)
         InitializeChecks();
-    
+    else if (gPlayState == nullptr || gSaveContext.fileNum < 0 || gSaveContext.fileNum > 2) {
+        Teardown();
+        return;
+    }
+
     if (CVar_GetS32("gCheckTrackerWindowType", 1) == 0) {
         if (CVar_GetS32("gCheckTrackerShowOnlyPaused", 0) == 1)
             if (gPlayState == nullptr || gPlayState->pauseCtx.state == 0)
@@ -116,10 +120,6 @@ void DrawCheckTracker(bool& open) {
         ImGui::Text("Waiting for file load...");
         EndFloatWindows();
         return;
-    } else if (gPlayState == nullptr || gSaveContext.fileNum < 0 || gSaveContext.fileNum > 2) {
-        Teardown();
-        EndFloatWindows();
-        return;
     }
 
     SceneID sceneId = SCENE_ID_MAX;