hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1492 from SiboVG/issue-1491

Browse Source 
[#1491] Fix double 'Design not saved' dialog on macOS Cmd+Q quit
This commit is contained in:
SiboVG 2022-06-26 18:21:19 +02:00 committed by GitHub
commit e82564af63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swing/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -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;
}
}