From d04cf6316bb333d382f13bd6eda21ed2fd3333eb Mon Sep 17 00:00:00 2001
From: Manuel Dobusch <mdobusch.mmt-m2013@fh-salzburg.ac.at>
Date: Mon, 15 Feb 2016 18:50:08 +0100
Subject: [PATCH] logic: vs plugin update

Changed some exception handling behavious in network utility
---
 .../vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo | Bin 118272 -> 134656 bytes
 .../CoatiPlugin/CoatiPlugin/NetworkUtility.cs |  15 +++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo
index 8c2b5d3ab1a52c92338c45dabd8195249c8535c4..adb8d25f0d3e24fa606634f0e76aedc15ea95d9d 100644
GIT binary patch
delta 2813
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

delta 2630
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
VUoM2uW!S}EKTDxm@5Z!AzX2@TOr!t+

diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/NetworkUtility.cs b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/NetworkUtility.cs
index af31b1d7..c80f2f3e 100644
--- a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/NetworkUtility.cs
+++ b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/NetworkUtility.cs
@@ -157,9 +157,12 @@ namespace CoatiSoftware.CoatiPlugin
             Socket client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
 
             IAsyncResult ar = client.BeginConnect(remoteEP, new AsyncCallback(ConnectCallback), client);
-            if (!connectDone.WaitOne(1000))
+            if (!connectDone.WaitOne(2000))
             {
                 client.EndConnect(ar);
+                client.Shutdown(SocketShutdown.Both);
+                client.Close();
+                return;
             }
 
             Send(client, message);
@@ -214,7 +217,15 @@ namespace CoatiSoftware.CoatiPlugin
             {
                 if (_onErrorCallback != null)
                 {
-                    _onErrorCallback(e.ToString());
+                    if (e is ObjectDisposedException)
+                    {
+                        // get this exception every once in a while
+                        // doesn't seem to do much, no idea yet why it's there to begin with
+                    }
+                    else
+                    {
+                        _onErrorCallback(e.ToString());
+                    }
                 }
             }
         }