From 6e02bdec2e859dc57d2746d80f7eeae83a8ed678 Mon Sep 17 00:00:00 2001 From: ryder052 Date: Mon, 30 Dec 2024 02:10:12 +0100 Subject: [PATCH] Fix crash on replay list sorting, fix error popups on win debug (#5388) * Fix annoying popups on start * Fix replay list item parent index calculation #5311 --------- Co-authored-by: Jakub Mrowinski --- cockatrice/src/game/cards/card_database_model.cpp | 4 ++++ .../src/server/remote/remote_replay_list_tree_widget.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cockatrice/src/game/cards/card_database_model.cpp b/cockatrice/src/game/cards/card_database_model.cpp index 47f79eff5..5607b077f 100644 --- a/cockatrice/src/game/cards/card_database_model.cpp +++ b/cockatrice/src/game/cards/card_database_model.cpp @@ -174,6 +174,10 @@ void CardDatabaseDisplayModel::fetchMore(const QModelIndex &index) int remainder = sourceModel()->rowCount(index) - loadedRowCount; int itemsToFetch = qMin(100, remainder); + if (itemsToFetch == 0) { + return; + } + beginInsertRows(QModelIndex(), loadedRowCount, loadedRowCount + itemsToFetch - 1); loadedRowCount += itemsToFetch; diff --git a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp index 88d59a57a..3f58d898a 100644 --- a/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp +++ b/cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp @@ -192,7 +192,7 @@ QModelIndex RemoteReplayList_TreeModel::parent(const QModelIndex &ind) const return QModelIndex(); else { ReplayNode *replayNode = dynamic_cast(static_cast(ind.internalPointer())); - return createIndex(replayNode->getParent()->indexOf(replayNode), 0, replayNode); + return createIndex(replayNode->getParent()->indexOf(replayNode), 0, replayNode->getParent()); } }