diff options
author | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-06-19 16:32:22 +0200 |
---|---|---|
committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-06-19 16:32:22 +0200 |
commit | 1c043d567230d639fa86afb96575689bfc8abdcd (patch) | |
tree | 8af62d8454edb480c9f1ade5f0e875bae8d61b02 | |
parent | 932687bc105904e27ee120be95d2c9f1660ecdfa (diff) |
fix lock issue for QT node diconnect and RPC disconnectnode
-rw-r--r-- | src/qt/rpcconsole.cpp | 2 | ||||
-rw-r--r-- | src/rpcnet.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 681617bd81..f828ce2534 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -687,7 +687,7 @@ void RPCConsole::disconnectSelectedNode() QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address); // Find the node, disconnect it and clear the selected node if (CNode *bannedNode = FindNode(strNode.toStdString())) { - bannedNode->CloseSocketDisconnect(); + bannedNode->fDisconnect = true; clearSelectedNode(); } } diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index 5a26c7c3ae..1572b16687 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -231,7 +231,7 @@ UniValue disconnectnode(const UniValue& params, bool fHelp) if (pNode == NULL) throw JSONRPCError(RPC_CLIENT_NODE_NOT_CONNECTED, "Node not found in connected nodes"); - pNode->CloseSocketDisconnect(); + pNode->fDisconnect = true; return NullUniValue; } @@ -519,7 +519,7 @@ UniValue setban(const UniValue& params, bool fHelp) //disconnect possible nodes while(CNode *bannedNode = (isSubnet ? FindNode(subNet) : FindNode(netAddr))) - bannedNode->CloseSocketDisconnect(); + bannedNode->fDisconnect = true; } else if(strCommand == "remove") { |