diff options
author | flow <flowlnlnln@gmail.com> | 2022-09-16 20:00:36 -0300 |
---|---|---|
committer | flow <flowlnlnln@gmail.com> | 2022-09-16 20:12:30 -0300 |
commit | c9eb584ac80956730dd56068945f6791e29716b3 (patch) | |
tree | 0ccbfb8ab5d42d115b861af972eb45b54014091e /launcher/minecraft/mod/ResourceFolderModel.h | |
parent | 10493bd44ab59171ac4f2e3ab7b600bcff8e4af6 (diff) | |
download | PrismLauncher-c9eb584ac80956730dd56068945f6791e29716b3.tar.gz PrismLauncher-c9eb584ac80956730dd56068945f6791e29716b3.tar.bz2 PrismLauncher-c9eb584ac80956730dd56068945f6791e29716b3.zip |
fix: prevent deletes by shared pointer accidental creation
This fixes the launcher crashing when opening the game :iea:
Signed-off-by: flow <flowlnlnln@gmail.com>
Diffstat (limited to 'launcher/minecraft/mod/ResourceFolderModel.h')
-rw-r--r-- | launcher/minecraft/mod/ResourceFolderModel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/launcher/minecraft/mod/ResourceFolderModel.h b/launcher/minecraft/mod/ResourceFolderModel.h index 5652c156..7edbe030 100644 --- a/launcher/minecraft/mod/ResourceFolderModel.h +++ b/launcher/minecraft/mod/ResourceFolderModel.h @@ -68,7 +68,7 @@ class ResourceFolderModel : public QAbstractListModel { virtual bool update(); /** Creates a new parse task, if needed, for 'res' and start it.*/ - virtual void resolveResource(Resource::Ptr res); + virtual void resolveResource(Resource* res); [[nodiscard]] size_t size() const { return m_resources.size(); }; [[nodiscard]] bool empty() const { return size() == 0; } @@ -265,7 +265,7 @@ void ResourceFolderModel::applyUpdates(QSet<QString>& current_set, QSet<QString> } m_resources[row].reset(new_resource); - resolveResource(m_resources.at(row)); + resolveResource(m_resources[row].get()); emit dataChanged(index(row, 0), index(row, columnCount(QModelIndex()) - 1)); } } @@ -313,7 +313,7 @@ void ResourceFolderModel::applyUpdates(QSet<QString>& current_set, QSet<QString> for (auto& added : added_set) { auto res = new_resources[added]; m_resources.append(res); - resolveResource(res); + resolveResource(m_resources.last().get()); } endInsertRows(); |