Fixed invalid access to _instance in RetryQueue, fixes #681

1 files changed, 5 insertions, 2 deletions

diff --git a/csharp/src/Ice/RetryQueue.cs b/csharp/src/Ice/RetryQueue.cs
index a97dd8feb82..3bf3a49c040 100644
--- a/csharp/src/Ice/RetryQueue.cs
+++ b/csharp/src/Ice/RetryQueue.cs
@@ -131,12 +131,15 @@ namespace IceInternal
             {
                 if(_requests.Remove(task))
                 {
-                    if(_instance == null && _requests.Count == 0)
+                    if(_instance != null)
+                    {
+                        return _instance.timer().cancel(task);
+                    }
+                    else if(_requests.Count == 0)
                     {
                         // If we are destroying the queue, destroy is probably waiting on the queue to be empty.
                         System.Threading.Monitor.Pulse(this);
                     }
-                    return _instance.timer().cancel(task);
                 }
                 return false;
             }