Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes GetRpcResult not removing calluid from call list on non blocking call (#100)

Browse Source
This commit is contained in:
Thad House
2016-08-19 21:48:30 -07:00
committed by Peter Johnson
parent 66d214c8a8
commit 7845caa100
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Storage.cpp
View File

@@ -1421,7 +1421,10 @@ bool Storage::GetRpcResult(bool blocking, unsigned int call_uid, double time_out
auto i =
m_rpc_results.find(std::make_pair(call_uid >> 16, call_uid & 0xffff));
if (i == m_rpc_results.end()) {
if (!blocking || m_terminating) return false;
if (!blocking || m_terminating) {
m_rpc_blocking_calls.erase(call_uid);
return false;
}
if (time_out < 0) {
m_rpc_results_cond.wait(lock);
} else {