Winify

Subversion Repositories:

 /trunk/Winify/Gotify/GotifyConnection.cs
@@ -312,9 +312,16 @@
             _cancellationTokenSource.Cancel();
-            await _heartBeatTask;
-            await _retrievePastMessagesTask;
+            if (_heartBeatTask != null)
+            {
+                await _heartBeatTask;
+            }
+            if (_retrievePastMessagesTask != null)
+            {
+                await _retrievePastMessagesTask;
+            }
             if (_webSocketSharp != null)
             {
                 _webSocketSharp.OnMessage -= WebSocketSharp_OnMessage;

Compare Path:	Rev
With Path:	Rev