Selaa lähdekoodia

Check to see if an SSD exists before trying to close it with the server

Fixes issue 3543
Fixes issue 3545

Change-Id: I71426cf26a029c2886c33a3c0698698031c0df95
Reviewed-on: http://gerrit.dmdirc.com/538
Automatic-Compile: Chris Smith <chris@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.3
Gregory Holmes 14 vuotta sitten
vanhempi
commit
5332b36346

+ 3
- 2
src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java Näytä tiedosto

31
 import com.dmdirc.ui.interfaces.ServerWindow;
31
 import com.dmdirc.ui.interfaces.ServerWindow;
32
 import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
32
 import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
33
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
33
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
34
-import java.awt.Window;
35
 
34
 
36
 import java.awt.event.ActionEvent;
35
 import java.awt.event.ActionEvent;
37
 import java.awt.event.ActionListener;
36
 import java.awt.event.ActionListener;
156
     /** {@inheritDoc} */
155
     /** {@inheritDoc} */
157
     @Override
156
     @Override
158
     public void close() {
157
     public void close() {
159
-        ServerSettingsDialog.getServerSettingsDialog(getContainer().getServer(),
158
+        if (ServerSettingsDialog.hasServerSettingsDialog()) {
159
+            ServerSettingsDialog.getServerSettingsDialog(getContainer().getServer(),
160
                 getController().getMainFrame()).dispose();
160
                 getController().getMainFrame()).dispose();
161
+        }
161
         super.close();
162
         super.close();
162
     }
163
     }
163
 }
164
 }

+ 11
- 0
src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java Näytä tiedosto

121
         return me;
121
         return me;
122
     }
122
     }
123
 
123
 
124
+    /**
125
+     * Checks if a Server settings dialog exists.
126
+     *
127
+     * @return true iif a dialog exists
128
+     */
129
+    public static boolean hasServerSettingsDialog() {
130
+        synchronized (ServerSettingsDialog.class) {
131
+            return me != null;
132
+        }
133
+    }
134
+
124
     /** Initialises the main UI components. */
135
     /** Initialises the main UI components. */
125
     private void initComponents() {
136
     private void initComponents() {
126
         orderButtons(new JButton(), new JButton());
137
         orderButtons(new JButton(), new JButton());

Loading…
Peruuta
Tallenna