From a746b23944ecca700df3ccc3d3523e936be2c74b Mon Sep 17 00:00:00 2001
From: TakaRikka <takarikka@outlook.com>
Date: Tue, 1 Sep 2026 03:11:04 -0700
Subject: [PATCH] make sure tools are disabled for speedrun mode and reset run
 info when mode is deactivated

---
 src/dusk/speedrun.cpp    | 5 +++++
 src/dusk/ui/settings.cpp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/dusk/speedrun.cpp b/src/dusk/speedrun.cpp
index 8527f9510a..166ef70839 100644
--- a/src/dusk/speedrun.cpp
+++ b/src/dusk/speedrun.cpp
@@ -19,6 +19,8 @@ static void onSpeedrunModeDeactive() {
     if (getSettings().game.liveSplitEnabled) {
         speedrun::disconnectLiveSplit();
     }
+    g_speedrunInfo.reset();
+    reset();
 }
 
 void registerSpeedrunGameMode() {
@@ -82,6 +84,9 @@ void resetForSpeedrunMode() {
     getSettings().backend.enableAdvancedSettings.setSpeedrunValue(false);
     getSettings().game.recordingMode.setSpeedrunValue(false);
     getSettings().game.debugFlyCam.setSpeedrunValue(false);
+
+    getSettings().game.enableMoveLinkCombo.setSpeedrunValue(false);
+    getSettings().game.enableTeleportCombo.setSpeedrunValue(false);
 }
 
 static void clearSpeedrunOverrides() {
diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp
index 5622110dc9..a546f1c76a 100644
--- a/src/dusk/ui/settings.cpp
+++ b/src/dusk/ui/settings.cpp
@@ -1239,7 +1239,7 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) {
             {
                 .key = "Speedrun Mode",
                 .helpText =
-                    "Enables speedrunning options while restricting certain gameplay modifiers.",
+                    "Enables Speedrun game mode option in the Dusklight launch menu.",
                 .onChange =
                     [this](bool enabled) {
                         if (enabled) {