From 6aecbfc38fe3ec2b6fc6d9f3e2a76fc03229729b Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Fri, 1 Sep 2023 12:50:20 +0100
Subject: [PATCH] Fix crashes

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/QObjectPtr.h                              |  6 +++++-
 .../minecraft/mod/tasks/ResourceFolderLoadTask.cpp | 14 +++++++++++---
 .../minecraft/mod/tasks/ResourceFolderLoadTask.h   |  5 ++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/launcher/QObjectPtr.h b/launcher/QObjectPtr.h
index 5f7b64df0..88c17c0b2 100644
--- a/launcher/QObjectPtr.h
+++ b/launcher/QObjectPtr.h
@@ -33,7 +33,11 @@ class shared_qobject_ptr : public QSharedPointer<T> {
     {}
 
     void reset() { QSharedPointer<T>::reset(); }
-    void reset(T* other) { QSharedPointer<T>::reset(other); }
+    void reset(T* other)
+    {
+        shared_qobject_ptr<T> t(other);
+        this->swap(t);
+    }
     void reset(const shared_qobject_ptr<T>& other)
     {
         shared_qobject_ptr<T> t(other);
diff --git a/launcher/minecraft/mod/tasks/ResourceFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ResourceFolderLoadTask.cpp
index 1004bcff0..2a02eb177 100644
--- a/launcher/minecraft/mod/tasks/ResourceFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ResourceFolderLoadTask.cpp
@@ -45,6 +45,14 @@ ResourceFolderLoadTask::ResourceFolderLoadTask(const QDir& resource_dir,
                                                bool is_indexed,
                                                bool clean_orphan,
                                                std::function<Resource*(const QFileInfo&)> create_function)
+    : Task(nullptr, false)
+    , m_resource_dir(resource_dir)
+    , m_index_dir(index_dir)
+    , m_is_indexed(is_indexed)
+    , m_clean_orphan(clean_orphan)
+    , m_create_func(create_function)
+    , m_result(new Result())
+    , m_thread_to_spawn_into(thread())
 {}
 
 void ResourceFolderLoadTask::executeTask()
@@ -58,8 +66,8 @@ void ResourceFolderLoadTask::executeTask()
     }
 
     // Read JAR files that don't have metadata
-    m_mods_dir.refresh();
-    for (auto entry : m_mods_dir.entryInfoList()) {
+    m_resource_dir.refresh();
+    for (auto entry : m_resource_dir.entryInfoList()) {
         Resource* resource = m_create_func(entry);
 
         if (resource->enabled()) {
@@ -121,7 +129,7 @@ void ResourceFolderLoadTask::getFromMetadata()
         if (!metadata.isValid())
             return;
 
-        auto* resource = m_create_func(QFileInfo(m_mods_dir.filePath(metadata.filename)));
+        auto* resource = m_create_func(QFileInfo(m_resource_dir.filePath(metadata.filename)));
         resource->setMetadata(metadata);
         resource->setStatus(ResourceStatus::NOT_INSTALLED);
         m_result->resources[resource->internal_id()].reset(resource);
diff --git a/launcher/minecraft/mod/tasks/ResourceFolderLoadTask.h b/launcher/minecraft/mod/tasks/ResourceFolderLoadTask.h
index 616597ca4..9950345ef 100644
--- a/launcher/minecraft/mod/tasks/ResourceFolderLoadTask.h
+++ b/launcher/minecraft/mod/tasks/ResourceFolderLoadTask.h
@@ -73,15 +73,14 @@ class ResourceFolderLoadTask : public Task {
     void getFromMetadata();
 
    private:
-    QDir m_mods_dir, m_index_dir;
+    QDir m_resource_dir, m_index_dir;
     bool m_is_indexed;
     bool m_clean_orphan;
+    std::function<Resource*(QFileInfo const&)> m_create_func;
     ResultPtr m_result;
 
     std::atomic<bool> m_aborted = false;
 
-    std::function<Resource*(QFileInfo const&)> m_create_func;
-
     /** This is the thread in which we should put new mod objects */
     QThread* m_thread_to_spawn_into;
 };