瀏覽代碼

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 年之前
父節點
當前提交
5332b36346

+ 3
- 2
src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java 查看文件

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

+ 11
- 0
src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java 查看文件

@@ -121,6 +121,17 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
121 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 135
     /** Initialises the main UI components. */
125 136
     private void initComponents() {
126 137
         orderButtons(new JButton(), new JButton());

Loading…
取消
儲存