X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FHighLevelClient.java;h=b64601dd4698e378f151295365dd2d1984300560;hb=6ab34aae67d7f0423464eda202f9c03101107db9;hp=5de3aa230f5567fe8d5c355b3f79f4f9bc11030f;hpb=8cccf818170f022f84e9c1db7cad5eb7d6cc3f8e;p=jFCPlib.git

diff --git a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java
index 5de3aa2..b64601d 100644
--- a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java
+++ b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java
@@ -106,7 +106,7 @@ public class HighLevelClient {
 	private final String clientName;
 
 	/** The FCP connection to the node. */
-	private FcpConnection fcpConnection;
+	private FcpConnection fcpConnection = null;
 
 	/** Listeners for high-level client events. */
 	private List<HighLevelClientListener> highLevelClientListeners = Collections.synchronizedList(new ArrayList<HighLevelClientListener>());
@@ -518,7 +518,6 @@ public class HighLevelClient {
 			fcpConnection.close();
 		}
 		fcpConnection = null;
-		fireClientDisconnected(throwable);
 	}
 
 	/**
@@ -711,6 +710,7 @@ public class HighLevelClient {
 			}
 			cancelIdentifier(null);
 			disconnect(throwable);
+			fireClientDisconnected(throwable);
 		}
 
 		/**