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

Fixes Rpc Cancel. Check was only in timeout case instead of global (#110)

Browse Source
This commit is contained in:
Thad House
2016-09-02 19:28:59 -07:00
committed by Peter Johnson
parent 2150f5879b
commit fc48944b47
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Storage.cpp
View File

@@ -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);