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

FC Updates from BitShares and myself #21

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

5
src/network/http/websocket.cpp
View file

@ -471,12 +471,13 @@ namespace fc { namespace http {
} }
~websocket_client_impl() ~websocket_client_impl()
{ {
if(_connection ) if( _connection )
{ {
_connection->close(0, "client closed"); _connection->close(0, "client closed");
_connection.reset(); _connection.reset();
_closed->wait();
} }
if( _closed )
_closed->wait();
} }
fc::promise<void>::ptr _connected; fc::promise<void>::ptr _connected;
fc::promise<void>::ptr _closed; fc::promise<void>::ptr _closed;