Skip to content

Commit 32ce58c

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 3746548 commit 32ce58c

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
@@ -148,7 +148,30 @@ void PeerTableModel::refresh()
148148
new_peers_data.append(stats);
149149
}
150150

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

src/qt/peertablemodel.h

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

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

src/qt/rpcconsole.cpp

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

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

644644
// set up ban table
645645
ui->banlistWidget->setModel(model->getBanTableModel());

0 commit comments

Comments
 (0)