From 3469f6733ccf9f5192049d64acaedb2394d64509 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Tue, 10 Nov 2015 23:21:50 -0800
Subject: [PATCH] GetRpcResult: Check m_terminating after wait() returns.

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

diff --git a/src/Storage.cpp b/src/Storage.cpp
index 5e03649948..e2903e0a5e 100644
--- a/src/Storage.cpp
+++ b/src/Storage.cpp
@@ -1371,6 +1371,7 @@ bool Storage::GetRpcResult(bool blocking, unsigned int call_uid,
     if (i == m_rpc_results.end()) {
       if (!blocking || m_terminating) return false;
       m_rpc_results_cond.wait(lock);
+      if (m_terminating) return false;
       continue;
     }
     result->swap(i->getSecond());