From 0b1ecee3d158d612388b941ad8446a168573e683 Mon Sep 17 00:00:00 2001
From: NTAuthority <bas@dotbas.net>
Date: Sat, 7 Mar 2015 23:27:14 +0100
Subject: [PATCH] move Disconnect() out of exception handlers in NPClient to
 allow graceful disconnection to work

---
 src/client/NP/NPClient.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/client/NP/NPClient.cs b/src/client/NP/NPClient.cs
index ffa384d..414e996 100644
--- a/src/client/NP/NPClient.cs
+++ b/src/client/NP/NPClient.cs
@@ -91,15 +91,14 @@ namespace NPSharp.NP
                 catch (ProtocolViolationException error)
                 {
                     _log.ErrorFormat("Protocol violation: {0}. Disconnect imminent.", error.Message);
-                    Disconnect();
                 }
                 catch (Exception error)
                 {
                     _log.ErrorFormat("Loop error in RPC read: {0}", error.ToString());
-                    Disconnect();
                 }
 
                 _log.Debug("Now not receiving RPC messages anymore");
+                Disconnect();
             }, _cancellationToken);
 
             _log.Debug("Connect() done");