small fix to reader task disposing

genielabs · Aug 18, 2015 · 0bbeeac · 0bbeeac
1 parent 09dac32
commit 0bbeeac
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/SerialPortLib/SerialPort.cs b/SerialPortLib/SerialPort.cs
@@ -103,7 +103,8 @@ public void Disconnect()
             {
                 watcherTokenSource.Cancel();
                 connectionWatcher.Wait(5000);
-                connectionWatcher.Dispose();
+                if (connectionWatcher != null)
+                    connectionWatcher.Dispose();
                 connectionWatcher = null;
                 watcherTokenSource = null;
             }
@@ -224,7 +225,8 @@ private void Close()
             {
                 readerTokenSource.Cancel();
                 readerTask.Wait(5000);
-                readerTask.Dispose();
+                if (readerTask != null)
+                    readerTask.Dispose();
                 readerTask = null;
                 readerTokenSource = null;
             }