diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-12-19 15:35:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 15:35:34 +0100 |
| commit | df1b7f165662823795626ec82d0f3d53c668a88f (patch) | |
| tree | c729b39a03657a9a026b891f5e3d0a1b91fb78ec /launcher/minecraft/mod/ResourceFolderModel.h | |
| parent | 11c8237d8bddbf1fe371f6bc6c2cbc9f07e66e51 (diff) | |
| parent | 81fedbf03c9218f04b0908b474c32005414e3600 (diff) | |
| download | PrismLauncher-df1b7f165662823795626ec82d0f3d53c668a88f.tar.gz PrismLauncher-df1b7f165662823795626ec82d0f3d53c668a88f.tar.bz2 PrismLauncher-df1b7f165662823795626ec82d0f3d53c668a88f.zip | |
Merge pull request #628 from flowln/fix_multiple_resource_packs_crash
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/624
Diffstat (limited to 'launcher/minecraft/mod/ResourceFolderModel.h')
| -rw-r--r-- | launcher/minecraft/mod/ResourceFolderModel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/launcher/minecraft/mod/ResourceFolderModel.h b/launcher/minecraft/mod/ResourceFolderModel.h index fe283b04..f1bc2dd7 100644 --- a/launcher/minecraft/mod/ResourceFolderModel.h +++ b/launcher/minecraft/mod/ResourceFolderModel.h @@ -10,6 +10,7 @@ #include "Resource.h" #include "tasks/Task.h" +#include "tasks/ConcurrentTask.h" class QSortFilterProxyModel; @@ -197,6 +198,7 @@ class ResourceFolderModel : public QAbstractListModel { // Represents the relationship between a resource's internal ID and it's row position on the model. QMap<QString, int> m_resources_index; + ConcurrentTask m_helper_thread_task; QMap<int, Task::Ptr> m_active_parse_tasks; std::atomic<int> m_next_resolution_ticket = 0; }; |