Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader

Browse Source
This commit is contained in:
Trial97
2024-03-27 18:55:34 +02:00
parent 2318a83881 e212c019a0
commit f6572c1244
131 changed files with 1189 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/minecraft/mod/ResourceFolderModel.h
View File

@ -303,7 +303,6 @@ void ResourceFolderModel::applyUpdates(QSet<QString>& current_set, QSet<QString>
auto removed_it = m_resources.begin() + removed_index;
Q_ASSERT(removed_it != m_resources.end());
Q_ASSERT(removed_set.contains(removed_it->get()->internal_id()));
if ((*removed_it)->isResolving()) {
auto ticket = (*removed_it)->resolutionTicket();