Issue 1767

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

src/com/dmdirc/Server.java

@@ -371,14 +371,14 @@ public final class Server extends WritableFrameContainer implements Serializable
                 break;
             }
 
-            myState.transition(ServerState.DISCONNECTING);
-        
-            removeInvites();
-            updateIcon();
-
             if (parser == null) {
                 myState.transition(ServerState.DISCONNECTED);
             } else {
+                myState.transition(ServerState.DISCONNECTING);
+
+                removeInvites();
+                updateIcon();
+
                 parser.disconnect(reason);
             }
 
@@ -1196,6 +1196,8 @@ public final class Server extends WritableFrameContainer implements Serializable
     @Precondition("The current server state is CONNECTING")
     public void onConnectError(final ParserError errorInfo) {
         synchronized (this) {
+            parser = null;
+
             if (myState.getState() == ServerState.CLOSING
                     || myState.getState() == ServerState.DISCONNECTING) {
                 // Do nothing

src/com/dmdirc/ServerState.java

@@ -68,6 +68,7 @@ public enum ServerState {
     RECONNECT_WAIT(
             "CONNECTING",                // User forced a connect attempt
             "TRANSIENTLY_DISCONNECTED",  // Reconnect timer expired
+            "DISCONNECTED",              // User forced a disconnect
             "CLOSING"                    // DMDirc is closing
     ),