From b49d490cc161d7c49ea51e182497f7df2f211d51 Mon Sep 17 00:00:00 2001
From: Miodec <bartnikjack@gmail.com>
Date: Fri, 11 Feb 2022 20:14:20 +0100
Subject: [PATCH] removed dependency by moving code part of #2462

---
 frontend/src/js/controllers/challenge-controller.js | 6 ++----
 frontend/src/js/elements/commandline-lists.js       | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/src/js/controllers/challenge-controller.js b/frontend/src/js/controllers/challenge-controller.js
index 61b8e3fbb..0382097de 100644
--- a/frontend/src/js/controllers/challenge-controller.js
+++ b/frontend/src/js/controllers/challenge-controller.js
@@ -2,7 +2,6 @@ import * as Misc from "../misc";
 import * as Notifications from "../elements/notifications";
 import * as ManualRestart from "../test/manual-restart-tracker";
 import * as CustomText from "../test/custom-text";
-import * as TestLogic from "../test/test-logic";
 import * as Funbox from "../test/funbox";
 import Config, * as UpdateConfig from "../config";
 import * as TestUI from "../test/test-ui";
@@ -167,12 +166,11 @@ export async function setup(challengeName) {
     if (challenge === undefined) {
       Notifications.add("Challenge not found", 0);
       ManualRestart.set();
-      TestLogic.restart(false, true);
       setTimeout(() => {
         $("#top .config").removeClass("hidden");
         $(".page.pageTest").removeClass("hidden");
       }, 250);
-      return;
+      return false;
     }
     if (challenge.type === "customTime") {
       UpdateConfig.setTimeConfig(challenge.parameters[0], true);
@@ -239,7 +237,6 @@ export async function setup(challengeName) {
       }
     }
     ManualRestart.set();
-    TestLogic.restart(false, true);
     notitext = challenge.message;
     $("#top .config").removeClass("hidden");
     $(".page.pageTest").removeClass("hidden");
@@ -251,6 +248,7 @@ export async function setup(challengeName) {
     }
     TestState.setActiveChallenge(challenge);
     challengeLoading = false;
+    return true;
   } catch (e) {
     Notifications.add("Something went wrong: " + e, -1);
   }
diff --git a/frontend/src/js/elements/commandline-lists.js b/frontend/src/js/elements/commandline-lists.js
index a52d205de..9b5302306 100644
--- a/frontend/src/js/elements/commandline-lists.js
+++ b/frontend/src/js/elements/commandline-lists.js
@@ -2332,6 +2332,7 @@ Misc.getChallengeList().then((challenges) => {
       display: challenge.display,
       exec: () => {
         ChallengeController.setup(challenge.name);
+        TestLogic.restart(false, true);
       },
     });
   });