From 371ef6f8413a12e467f8be1a238b34c9abd0a794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?=
 <159546+serprex@users.noreply.github.com>
Date: Mon, 7 Sep 2026 23:59:18 +0000
Subject: [PATCH] Leave Start Randomizer disabled after generation fails
 (#7157)

---
 soh/soh/Enhancements/randomizer/3drando/menu.cpp | 1 +
 soh/soh/SohGui/SohMenuRandomizer.cpp             | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index 44d9eba403..cb118cded1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -16,6 +16,7 @@ bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<Ra
     const auto ctx = Rando::Context::GetInstance();
     ResetPerformanceTimers();
     StartPerformanceTimer(PT_WHOLE_SEED);
+    ctx->SetSpoilerLoaded(false);
 
     // if a blank seed was entered, make a random one
     if (seedInput.empty()) {
diff --git a/soh/soh/SohGui/SohMenuRandomizer.cpp b/soh/soh/SohGui/SohMenuRandomizer.cpp
index 4bf8c51d4a..42fdf7865c 100644
--- a/soh/soh/SohGui/SohMenuRandomizer.cpp
+++ b/soh/soh/SohGui/SohMenuRandomizer.cpp
@@ -717,7 +717,6 @@ void SohMenu::AddMenuRandomizer() {
     });
     AddWidget(path, "Generate Randomizer", WIDGET_BUTTON)
         .Callback([](WidgetInfo& info) {
-            Rando::Context::GetInstance()->SetSpoilerLoaded(false);
             GenerateRandomizer(CVarGetInteger(CVAR_RANDOMIZER_SETTING("ManualSeedEntry"), 0) ? seedString : "");
         })
         .PreFunc([](WidgetInfo& info) {