TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-15 15:58:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed an window reopening bug after closing the main window while simulation is running.

Browse Source
This commit is contained in:
hneemann 2020-07-20 16:00:06 +02:00
parent 98114e0eb7
commit 50ef3dcd0f
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/neemann/digital/gui/Main.java
View File

@ -273,7 +273,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
library.removeListener(circuitComponent); library.removeListener(circuitComponent);
if (treeModel != null) if (treeModel != null)
library.removeListener(treeModel); library.removeListener(treeModel);
windowPosManager.closeAll(); windowPosManager.shutdown();
} }
}); });

14
src/main/java/de/neemann/digital/gui/components/WindowPosManager.java
View File

@ -17,6 +17,7 @@ import java.util.Map;
public class WindowPosManager { public class WindowPosManager {
private final Map<String, Window> windows; private final Map<String, Window> windows;
private final JFrame main; private final JFrame main;
private boolean shutdown;
/** /**
* Creates a new instance * Creates a new instance
@ -52,10 +53,21 @@ public class WindowPosManager {
window.setSize(oldWindow.getSize()); window.setSize(oldWindow.getSize());
oldWindow.dispose(); oldWindow.dispose();
} }
windows.put(id, window); if (shutdown)
window.dispose();
else
windows.put(id, window);
return window; return window;
} }
/**
* Closes all registered windows and avoids a reopening them.
*/
public void shutdown() {
shutdown = true;
closeAll();
}
/** /**
* Closes all registered windows * Closes all registered windows
*/ */