Browse Source

fix lock issue for QT node diconnect and RPC disconnectnode

pull/1/head
Jonas Schnelli 7 years ago
parent
commit
1c043d5672
  1. 2
      src/qt/rpcconsole.cpp
  2. 4
      src/rpcnet.cpp

2
src/qt/rpcconsole.cpp

@ -687,7 +687,7 @@ void RPCConsole::disconnectSelectedNode() @@ -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();
}
}

4
src/rpcnet.cpp

@ -231,7 +231,7 @@ UniValue disconnectnode(const UniValue& params, bool fHelp) @@ -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) @@ -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")
{

Loading…
Cancel
Save