From ad7831b0e18fc10bc41565757f19023b1ac12796 Mon Sep 17 00:00:00 2001
From: lieght <49651652+BAFGdeJong@users.noreply.github.com>
Date: Sat, 6 Dec 2025 21:22:45 +0100
Subject: [PATCH] Tutorials fixed

---
 .../main/java/org/toop/app/widget/popup/EscapePopup.java  | 8 +++++---
 .../org/toop/app/widget/tutorial/BaseTutorialWidget.java  | 2 --
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/toop/app/widget/popup/EscapePopup.java b/app/src/main/java/org/toop/app/widget/popup/EscapePopup.java
index dd749b6..f2df714 100644
--- a/app/src/main/java/org/toop/app/widget/popup/EscapePopup.java
+++ b/app/src/main/java/org/toop/app/widget/popup/EscapePopup.java
@@ -3,12 +3,12 @@ package org.toop.app.widget.popup;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import org.toop.app.widget.Primitive;
+import org.toop.app.widget.Widget;
 import org.toop.app.widget.WidgetContainer;
 import org.toop.app.widget.complex.PopupWidget;
 import org.toop.app.widget.complex.ViewWidget;
 import org.toop.app.widget.tutorial.*;
 import org.toop.app.widget.view.GameView;
-import org.toop.app.widget.view.MainView;
 import org.toop.app.widget.view.OptionsView;
 import org.toop.local.AppContext;
 
@@ -30,9 +30,11 @@ public class EscapePopup extends PopupWidget {
         }
 
         if (currentView.getClass().isAssignableFrom(GameView.class)) {
-            BaseTutorialWidget tut = AppContext.currentTutorial();
+            Widget tut = AppContext.currentTutorial();
             if (tut != null) {
-                nodes.add(Primitive.button("tutorialstring", () -> {}));
+                nodes.add(Primitive.button("tutorialstring", () -> {
+                    WidgetContainer.getCurrentView().add(Pos.CENTER, tut);
+                }));
             }
         }
 
diff --git a/app/src/main/java/org/toop/app/widget/tutorial/BaseTutorialWidget.java b/app/src/main/java/org/toop/app/widget/tutorial/BaseTutorialWidget.java
index ee963b5..9d48840 100644
--- a/app/src/main/java/org/toop/app/widget/tutorial/BaseTutorialWidget.java
+++ b/app/src/main/java/org/toop/app/widget/tutorial/BaseTutorialWidget.java
@@ -59,8 +59,6 @@ public class BaseTutorialWidget extends PopupWidget implements Updatable {
         var x = Primitive.vbox(imagery, tutorialText);
 
         add(Pos.CENTER, Primitive.vbox(x, w));
-
-        WidgetContainer.add(Pos.CENTER, this);
     }
 
     @Override