potential fix for #70

andyedinborough · May 2, 2012 · 775bfa6 · 775bfa6
1 parent 5491678
commit 775bfa6
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/TextClient.cs b/TextClient.cs
@@ -128,22 +128,20 @@ public void Disconnect() {
     }
 
     public void Dispose() {
-      Dispose(true);
-      GC.SuppressFinalize(this);
-    }
-
-    public virtual void Dispose(bool disposing) {
-      if (disposing) {
+      if (IsDisposed) return;
+      lock (this) {
+        if (IsDisposed) return;
+        IsDisposed = true;
         Disconnect();
 
         try {
           OnDispose();
         } catch (Exception) { }
 
-        IsDisposed = true;
         _Stream = null;
         _Connection = null;
       }
+      GC.SuppressFinalize(this);
     }
   }
 }