From 66d214c8a8e42317aa29bb9e1210dd563151d489 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Thu, 18 Aug 2016 00:05:06 -0700
Subject: [PATCH] Finishes blocking call canceling (#99)

---
 src/Storage.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Storage.cpp b/src/Storage.cpp
index 988b662b2b..8211e7790b 100644
--- a/src/Storage.cpp
+++ b/src/Storage.cpp
@@ -1432,6 +1432,9 @@ bool Storage::GetRpcResult(bool blocking, unsigned int call_uid, double time_out
           m_rpc_blocking_calls.erase(call_uid);
           return false;
         }
+        // if element does not exist, we have been canceled
+        if (m_rpc_blocking_calls.count(call_uid) == 0)
+          return false;
       }
       if (m_terminating) {
         m_rpc_blocking_calls.erase(call_uid);