Merge pull request #4 from artemutin/StopPersistentMercurialClient

hgtools · Jan 9, 2018 · 0e813d8 · 0e813d8
2 parents e380ed5 + dc9dffe
commit 0e813d8
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/Mercurial.Net/PersistentClient.cs b/src/Mercurial.Net/PersistentClient.cs
@@ -452,11 +452,22 @@ private void DecodeInitialBlock()
         private void StopPersistentMercurialClient()
         {
             if (_Process == null)
-                return;
+                return;
+
+            try
+            {
+                _Process.StandardInput.Close();
+                _Process.WaitForExit();
+            }
+            catch(ObjectDisposedException)
+            {
+                Debug.WriteLine("Prevented attempt to close already disposed StandardInput");
+            }
+            finally
+            {
+                _Process = null;
+            }
 
-            _Process.StandardInput.Close();
-            _Process.WaitForExit();
-            _Process = null;
         }
     }
 }