From fc48944b479e217ecd30f01ef87f179ad650112f Mon Sep 17 00:00:00 2001 From: Thad House Date: Fri, 2 Sep 2016 19:28:59 -0700 Subject: [PATCH] Fixes Rpc Cancel. Check was only in timeout case instead of global (#110) --- src/Storage.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Storage.cpp b/src/Storage.cpp index b5db2d6a5f..46f0ff34fb 100644 --- a/src/Storage.cpp +++ b/src/Storage.cpp @@ -1441,9 +1441,10 @@ 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 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);