Added DISCONNECTING server state. Should fix 'event called from parser that's not in use' errors.

Might fix issue 701

git-svn-id: http://svn.dmdirc.com/trunk@3644 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Server.java

@@ -230,6 +230,9 @@ public final class Server extends WritableFrameContainer implements Serializable
             case CONNECTING:
                 disconnect(configManager.getOption(DOMAIN_GENERAL, "quitmessage"));
                 break;
+            case DISCONNECTING:
+                onSocketClosed();
+                break;
             default:
                 // Do nothing
                 break;
@@ -327,24 +330,24 @@ public final class Server extends WritableFrameContainer implements Serializable
                 break;
             }
 
-            myState = ServerState.DISCONNECTED;
+            myState = ServerState.DISCONNECTING;
         }
 
         removeInvites();
         updateIcon();
 
-        if (parser != null && parser.getSocketState() == IRCParser.STATE_OPEN) {
+        if (parser != null) {
             parser.disconnect(reason);
+        }
 
-            if (configManager.getOptionBool(DOMAIN_GENERAL, "closechannelsonquit", false)) {
-                closeChannels();
-            } else {
-                clearChannels();
-            }
+        if (configManager.getOptionBool(DOMAIN_GENERAL, "closechannelsonquit", false)) {
+            closeChannels();
+        } else {
+            clearChannels();
+        }
 
-            if (configManager.getOptionBool(DOMAIN_GENERAL, "closequeriesonquit", false)) {
-                closeQueries();
-            }
+        if (configManager.getOptionBool(DOMAIN_GENERAL, "closequeriesonquit", false)) {
+            closeQueries();
         }
     }
 
@@ -1071,9 +1074,13 @@ public final class Server extends WritableFrameContainer implements Serializable
         handleNotification("socketClosed", getName());
 
         ActionManager.processEvent(CoreActionType.SERVER_DISCONNECTED, null, this);
+        
+        eventHandler.unregisterCallbacks();
 
         synchronized (myState) {
-            if (myState == ServerState.CLOSING || myState == ServerState.DISCONNECTED) {
+            if (myState == ServerState.CLOSING
+                    || myState == ServerState.DISCONNECTED
+                    || myState == ServerState.DISCONNECTING) {
                 // This has been triggered via .disconect()
                 return;
             }
@@ -1113,7 +1120,6 @@ public final class Server extends WritableFrameContainer implements Serializable
                 return;
             }
 
-            assert myState == ServerState.CONNECTING;
             myState = ServerState.TRANSIENTLY_DISCONNECTED;
         }
 

src/com/dmdirc/ServerState.java

@@ -32,6 +32,8 @@ public enum ServerState {
     TRANSIENTLY_DISCONNECTED,
     /** Indicates that the user has told us to disconnect. */
     DISCONNECTED,
+    /** In the process of disconnecting. */
+    DISCONNECTING,
     /** Indicates we're waiting for the auto-reconnect timer to fire. */
     RECONNECT_WAIT,
     /** Indicates that the server frame and its children are closing. */

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -30,8 +30,8 @@ import com.dmdirc.themes.ThemeManager;
 import com.dmdirc.ui.swing.components.pluginpanel.PluginPanel;
 import com.dmdirc.ui.swing.dialogs.prefs.URLConfigPanel;
 import com.dmdirc.ui.swing.dialogs.prefs.UpdateConfigPanel;
-
 import com.dmdirc.util.ListenerList;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;