From 9452c83031a610a036e5b8c33a0a954968521b55 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sun, 26 Jun 2022 13:01:38 +0200 Subject: [PATCH] [#1491] Keep track of quit called --- swing/src/net/sf/openrocket/gui/main/BasicFrame.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index d99ba0fea..6f923e79e 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -142,6 +142,7 @@ public class BasicFrame extends JFrame { private SimulationPanel simulationPanel; public static BasicFrame lastFrameInstance = null; // Latest BasicFrame that was created + private static boolean quitCalled = false; // Keeps track whether the quit action has been called /** @@ -1784,12 +1785,15 @@ public class BasicFrame extends JFrame { * Quit the application. Confirms saving unsaved designs. The action of File->Quit. */ public static void quitAction() { + if (quitCalled) return; + quitCalled = true; log.info("Quit action initiated"); for (int i = frames.size() - 1; i >= 0; i--) { log.debug("Closing frame " + frames.get(i)); if (!frames.get(i).closeAction()) { // Close canceled log.info("Quit was cancelled"); + quitCalled = false; return; } }