Skip to content

Commit b7fe2b1

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 f10b803 commit b7fe2b1

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
@@ -156,7 +156,30 @@ void PeerTableModel::refresh()
156156
new_peers_data.append(stats);
157157
}
158158

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

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)