Pārlūkot izejas kodu

Fixes issue 3425: Enter in NSD still occasionally opens two servers

Change-Id: I6b4296ccf660940cb9a7173ee6bd31b2fa87fe3e
Reviewed-on: http://gerrit.dmdirc.com/295
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
tags/0.6.3
Gregory Holmes 14 gadus atpakaļ
vecāks
revīzija
ae3301dcd4

+ 7
- 0
src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java Parādīt failu

84
     private JButton editProfileButton;
84
     private JButton editProfileButton;
85
     /** Main frame. */
85
     /** Main frame. */
86
     private MainFrame mainFrame;
86
     private MainFrame mainFrame;
87
+    /**  Opening new server? */
88
+    private boolean openingServer = false;
87
 
89
 
88
     /**
90
     /**
89
      * Creates a new instance of the dialog.
91
      * Creates a new instance of the dialog.
244
      * Saves the dialog changes.
246
      * Saves the dialog changes.
245
      */
247
      */
246
     private void save() {
248
     private void save() {
249
+        if (openingServer) {
250
+            dispose();
251
+            return;
252
+        }
247
         if (!serverField.validateText()) {
253
         if (!serverField.validateText()) {
248
             serverField.requestFocusInWindow();
254
             serverField.requestFocusInWindow();
249
             return;
255
             return;
258
         final int port = Integer.parseInt(portField.getText());
264
         final int port = Integer.parseInt(portField.getText());
259
 
265
 
260
         dispose();
266
         dispose();
267
+        openingServer = true;
261
 
268
 
262
         final Identity profile =
269
         final Identity profile =
263
                 (Identity) identityField.getSelectedItem();
270
                 (Identity) identityField.getSelectedItem();

Notiek ielāde…
Atcelt
Saglabāt