Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +5 -1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4ce3775630 - Show all commits

6
src/thread/future.cpp
View file

@ -61,7 +61,11 @@ namespace fc {
} }
_enqueue_thread(); _enqueue_thread();
// Need to check _ready again to avoid a race condition. // Need to check _ready again to avoid a race condition.
if( _ready.load() ) return _wait_until( timeout_us ); // this will simply return or throw _exceptp if( _ready.load() )
{
_dequeue_thread();
return _wait_until( timeout_us ); // this will simply return or throw _exceptp
}
std::exception_ptr e; std::exception_ptr e;
// //