From 816a0b953e08de5563c1ace07178c549bf9835f1 Mon Sep 17 00:00:00 2001
From: lieght <49651652+BAFGdeJong@users.noreply.github.com>
Date: Sat, 6 Dec 2025 15:11:23 +0100
Subject: [PATCH] Escape can't be opened in mainview now

---
 app/src/main/java/org/toop/app/App.java                    | 6 ++++++
 .../main/java/org/toop/app/widget/popup/EscapePopup.java   | 7 ++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/toop/app/App.java b/app/src/main/java/org/toop/app/App.java
index 4389088..e91ee70 100644
--- a/app/src/main/java/org/toop/app/App.java
+++ b/app/src/main/java/org/toop/app/App.java
@@ -140,6 +140,12 @@ public final class App extends Application {
 	}
 
 	public void escapePopup() {
+
+		if (   WidgetContainer.getCurrentView() == null
+			|| WidgetContainer.getCurrentView() instanceof MainView) {
+			return;
+		}
+
 		if (!Objects.requireNonNull(
 				WidgetContainer.find(widget -> widget instanceof QuitPopup || widget instanceof EscapePopup)
 		).isEmpty()) {
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 2fad839..dd749b6 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
@@ -2,25 +2,22 @@ package org.toop.app.widget.popup;
 
 import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.control.Button;
-import org.toop.app.App;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.WidgetContainer;
-import org.toop.app.widget.complex.ConfirmWidget;
 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;
 
-import java.awt.*;
 import java.util.ArrayList;
 
 public class EscapePopup extends PopupWidget {
     public EscapePopup() {
-        ArrayList<Node> nodes = new ArrayList<>();
         ViewWidget currentView = WidgetContainer.getCurrentView();
+        ArrayList<Node> nodes = new ArrayList<>();
 
         nodes.add(Primitive.button("Continue", this::hide, false)); // TODO, localize