Skip to content

Commit fa95a22

Browse files
committed
qt: Handle peer addition/removal in a right way
This change fixes a bug when a multiple rows selection gets inconsistent after a peer addition/removal.
1 parent 3f8c4b0 commit fa95a22

File tree

3 files changed

+30
-4
lines changed

3 files changed

+30
-4
lines changed

src/qt/peertablemodel.cpp

+26-3
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,30 @@ void PeerTableModel::refresh()
151151
new_peers_data.append(stats);
152152
}
153153

154-
Q_EMIT layoutAboutToBeChanged();
155-
m_peers_data.swap(new_peers_data);
156-
Q_EMIT layoutChanged();
154+
// Handle a new peer addition or an old peer in a right way. See:
155+
// - https://doc.qt.io/qt-5/model-view-programming.html#inserting-and-removing-rows
156+
// - https://doc.qt.io/qt-5/model-view-programming.html#resizable-models
157+
// We use the fact that interfaces::Node::getNodesStats
158+
// returns std::vector naturally sorted by nodeid.
159+
for (int i = 0; i < m_peers_data.size();) {
160+
if (i < new_peers_data.size() && m_peers_data.at(i).nodeStats.nodeid == new_peers_data.at(i).nodeStats.nodeid) {
161+
++i;
162+
continue;
163+
}
164+
// A peer has been removed from the table.
165+
beginRemoveRows(QModelIndex(), i, i);
166+
m_peers_data.erase(m_peers_data.begin() + i);
167+
endRemoveRows();
168+
}
169+
170+
if (m_peers_data.size() < new_peers_data.size()) {
171+
// Some peers have been added to the end of the table.
172+
beginInsertRows(QModelIndex(), m_peers_data.size(), new_peers_data.size() - 1);
173+
m_peers_data.swap(new_peers_data);
174+
endInsertRows();
175+
} else {
176+
m_peers_data.swap(new_peers_data);
177+
}
178+
179+
Q_EMIT changed();
157180
}

src/qt/peertablemodel.h

+3
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ class PeerTableModel : public QAbstractTableModel
7373
public Q_SLOTS:
7474
void refresh();
7575

76+
Q_SIGNALS:
77+
void changed();
78+
7679
private:
7780
//! Internal peer data structure.
7881
QList<CNodeCombinedStats> m_peers_data{};

src/qt/rpcconsole.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
644644

645645
// peer table signal handling - update peer details when selecting new node
646646
connect(ui->peerWidget->selectionModel(), &QItemSelectionModel::selectionChanged, this, &RPCConsole::updateDetailWidget);
647-
connect(model->getPeerTableModel(), &PeerTableModel::layoutChanged, this, &RPCConsole::updateDetailWidget);
647+
connect(model->getPeerTableModel(), &PeerTableModel::changed, this, &RPCConsole::updateDetailWidget);
648648

649649
// set up ban table
650650
ui->banlistWidget->setModel(model->getBanTableModel());

0 commit comments

Comments
 (0)