mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-06 05:16:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #628 from flowln/fix_multiple_resource_packs_crash

Browse source 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/624
This commit is contained in:
Sefa Eyeoglu 2022-12-19 15:35:34 +01:00
parent 3b1ab3c974
commit 5203e72199
No known key found for this signature in database
GPG key ID: C10411294912A422
7 changed files with 47 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
launcher/minecraft/mod/ResourceFolderModel.cpp
View file

@ -20,6 +20,7 @@ ResourceFolderModel::ResourceFolderModel(QDir dir, QObject* parent) : QAbstractL
m_dir.setSorting(QDir::Name | QDir::IgnoreCase | QDir::LocaleAware);
connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &ResourceFolderModel::directoryChanged);
connect(&m_helper_thread_task, &ConcurrentTask::finished, this, [this]{ m_helper_thread_task.clear(); });
}
ResourceFolderModel::~ResourceFolderModel()
@ -275,7 +276,11 @@ void ResourceFolderModel::resolveResource(Resource* res)
connect(
task, &Task::finished, this, [=] { m_active_parse_tasks.remove(ticket); }, Qt::ConnectionType::QueuedConnection);
QThreadPool::globalInstance()->start(task);
m_helper_thread_task.addTask(task);
if (!m_helper_thread_task.isRunning()) {
QThreadPool::globalInstance()->start(&m_helper_thread_task);
}
}
void ResourceFolderModel::onUpdateSucceeded()