From 061c8c9fffd021838bc3924648c37cdd81b70fa0 Mon Sep 17 00:00:00 2001
From: aMannus <mannusmenting@gmail.com>
Date: Fri, 22 Jul 2022 21:59:09 +0200
Subject: [PATCH] Small fix handling incompatible options

---
 soh/soh/Enhancements/randomizer/randomizer.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 538738e9ad..b72243e567 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -3707,7 +3707,6 @@ void DrawRandoEditor(bool& open) {
                                      "Timer",
                                      "Zelda Gasp (Adult)" };
 
-    bool disableZeldaRelatedOptions = CVar_GetS32("gRandomizeSkipChildZelda", 0);
 
         ImGui::SetNextWindowSize(ImVec2(750, 530), ImGuiCond_FirstUseEver);
         if (!ImGui::Begin("Randomizer Editor", &open, ImGuiWindowFlags_NoFocusOnAppearing)) {
@@ -3717,6 +3716,10 @@ void DrawRandoEditor(bool& open) {
 
         bool disableEditingRandoSettings = CVar_GetS32("gRandoGenerating", 0) ||
                                            CVar_GetS32("gOnFileSelectNameEntry", 0);
+        bool disableZeldaRelatedOptions = CVar_GetS32("gRandomizeSkipChildZelda", 0);
+        if (disableEditingRandoSettings) {
+            disableZeldaRelatedOptions = true;
+        }
         ImGui::PushItemFlag(ImGuiItemFlags_Disabled, disableEditingRandoSettings);
         ImGui::PushStyleVar(ImGuiStyleVar_Alpha,
                             ImGui::GetStyle().Alpha * disableEditingRandoSettings ? 0.5f : 1.0f);