Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: aborts when using a Qt build with assertions enabled

Browse Source 
Preventing undefined behaviour hooray! :D

Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2022-06-24 20:09:44 -03:00
parent 145da82cd8
commit e5f6dc1b14
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
5 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
launcher/minecraft/mod/ModFolderModel.cpp
View File

@ -167,12 +167,16 @@ void ModFolderModel::finishUpdate()
{ {
QSet<QString> added = newSet; QSet<QString> added = newSet;
added.subtract(currentSet); added.subtract(currentSet);
beginInsertRows(QModelIndex(), mods.size(), mods.size() + added.size() - 1);
for(auto & addedMod: added) { // When you have a Qt build with assertions turned on, proceeding here will abort the application
mods.append(newMods[addedMod]); if (added.size() > 0) {
resolveMod(mods.last()); beginInsertRows(QModelIndex(), mods.size(), mods.size() + added.size() - 1);
for (auto& addedMod : added) {
mods.append(newMods[addedMod]);
resolveMod(mods.last());
}
endInsertRows();
} }
endInsertRows();
} }
// update index // update index

4
launcher/ui/pages/modplatform/ModModel.cpp
View File

@ -219,6 +219,10 @@ void ListModel::searchRequestFinished(QJsonDocument& doc)
searchState = CanPossiblyFetchMore; searchState = CanPossiblyFetchMore;
} }
// When you have a Qt build with assertions turned on, proceeding here will abort the application
if (newList.size() == 0)
return;
beginInsertRows(QModelIndex(), modpacks.size(), modpacks.size() + newList.size() - 1); beginInsertRows(QModelIndex(), modpacks.size(), modpacks.size() + newList.size() - 1);
modpacks.append(newList); modpacks.append(newList);
endInsertRows(); endInsertRows();

5
launcher/ui/pages/modplatform/flame/FlameModel.cpp
View File

@ -221,6 +221,11 @@ void Flame::ListModel::searchRequestFinished()
nextSearchOffset += 25; nextSearchOffset += 25;
searchState = CanPossiblyFetchMore; searchState = CanPossiblyFetchMore;
} }
// When you have a Qt build with assertions turned on, proceeding here will abort the application
if (newList.size() == 0)
return;
beginInsertRows(QModelIndex(), modpacks.size(), modpacks.size() + newList.size() - 1); beginInsertRows(QModelIndex(), modpacks.size(), modpacks.size() + newList.size() - 1);
modpacks.append(newList); modpacks.append(newList);
endInsertRows(); endInsertRows();

4
launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
View File

@ -290,6 +290,10 @@ void ModpackListModel::searchRequestFinished(QJsonDocument& doc_all)
searchState = CanPossiblyFetchMore; searchState = CanPossiblyFetchMore;
} }
// When you have a Qt build with assertions turned on, proceeding here will abort the application
if (newList.size() == 0)
return;
beginInsertRows(QModelIndex(), modpacks.size(), modpacks.size() + newList.size() - 1); beginInsertRows(QModelIndex(), modpacks.size(), modpacks.size() + newList.size() - 1);
modpacks.append(newList); modpacks.append(newList);
endInsertRows(); endInsertRows();

5
launcher/ui/pages/modplatform/technic/TechnicModel.cpp
View File

@ -217,6 +217,11 @@ void Technic::ListModel::searchRequestFinished()
return; return;
} }
searchState = Finished; searchState = Finished;
// When you have a Qt build with assertions turned on, proceeding here will abort the application
if (newList.size() == 0)
return;
beginInsertRows(QModelIndex(), modpacks.size(), modpacks.size() + newList.size() - 1); beginInsertRows(QModelIndex(), modpacks.size(), modpacks.size() + newList.size() - 1);
modpacks.append(newList); modpacks.append(newList);
endInsertRows(); endInsertRows();