Changeset 6662 for trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

Timestamp:

2004-01-29T17:34:35+13:00 (20 years ago)

Author:

jmt12

Message:

Worked around stupid collection title clash warning dialog crashes spooty program on exit

File:

• trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -209 +209 @@
     }
     else if(esrc == menu_bar.file_exit) {
-        menu_bar.exit();
+        //menu_bar.exit();
         exit();
     }
@@ -539 +539 @@
      */
     public void exit() {
-    // First of all an exit can only happen if no modal dialog is currently being displayed. Something is creating a modal dialog but not disposing of it.
-    if(Gatherer.current_modal != null) {
-        System.err.println("There is a modal dialog open.");
-        Gatherer.current_modal.makeVisible();
-        Gatherer.current_modal.toFront();
-        return;
-    }
-
-    boolean cont = true;
-    if(Gatherer.c_man.ready() && !Gatherer.c_man.saved()) {
-        cont = showSaveCollectionBox(false, true);
-    }
-    else {
-        // Deal to help
-        if(help != null) {
-            help.destroy();
-            help = null;
-        }
-        Gatherer.self.exit();
+    // Tell everyone who cares that they are losing focus
+    if(config_pane.canSave()) {
+        boolean cont = true;
+        if(Gatherer.c_man.ready() && !Gatherer.c_man.saved()) {
+        cont = showSaveCollectionBox(false, true);
+        }
+        else {
+        // Deal to help
+        if(help != null) {
+            help.destroy();
+            help = null;
+        }
+        Gatherer.self.exit();
+        }
     }
     }
@@ -852 +847 @@
     //switch(result) {
     //case SaveCollectionBox.SAVE_YES:
+    Gatherer.c_man.setClosingThread(true);
     Gatherer.c_man.saveCollection(close_after, exit_after);
     // Wait until it is closed.
     try {
-        synchronized(this) {
+        synchronized(this) {
             while(Gatherer.c_man.reallyReady()) {
-            wait(10);
+            wait(10);
             }
-        }
+        }
     }
     catch(Exception error) {
@@ -865 +861 @@
         Gatherer.printStackTrace(error);
     }
-
+    
+    Gatherer.c_man.setClosingThread(false);
+    
     //content_pane.paintImmediately(bounds);
     return true;