X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIFrame.java;h=ac440190b69e8ec3c47a38f8a963a5599589b20a;hb=69791ef235161fef404f682fd6955e7eed8dc125;hp=3f74bca65004326172b7ade140e75fa91e218355;hpb=1098f7502a603a9cf80ad950f53a2c2abdf7ec93;p=fw%2Faltos

diff --git a/altosuilib/AltosUIFrame.java b/altosuilib/AltosUIFrame.java
index 3f74bca6..ac440190 100644
--- a/altosuilib/AltosUIFrame.java
+++ b/altosuilib/AltosUIFrame.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_11;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -23,8 +23,13 @@ import javax.swing.*;
 import java.util.*;
 
 class AltosUIFrameListener extends WindowAdapter {
+	@Override
 	public void windowClosing (WindowEvent e) {
-		AltosUIPreferences.unregister_ui_listener((AltosUIFrame) e.getWindow());
+		AltosUIFrame frame = (AltosUIFrame) e.getWindow();
+		AltosUIPreferences.unregister_ui_listener(frame);
+		AltosUIFrame.frame_closed();
+		frame.setVisible(false);
+		frame.dispose();
 	}
 }
 
@@ -263,10 +268,23 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi
 		return constraints(x, width, GridBagConstraints.NONE);
 	}
 
+	static int open_frames;
+
+	public static void frame_opened() {
+		++open_frames;
+	}
+
+	public static void frame_closed() {
+		--open_frames;
+		if (open_frames == 0)
+			System.exit(0);
+	}
+
 	void init() {
 		AltosUIPreferences.register_ui_listener(this);
 		AltosUIPreferences.register_position_listener(this);
 		position = AltosUIPreferences.position();
+		frame_opened();
 		addWindowListener(new AltosUIFrameListener());
 
 		/* Try to make menus live in the menu bar like regular Mac apps */