Merge pull request #1023 from flowln/better_shared_ptr

3 files changed, 7 insertions, 7 deletions

diff --git a/launcher/minecraft/MinecraftUpdate.cpp b/launcher/minecraft/MinecraftUpdate.cpp
index 0ce0c347..3a3aa864 100644
--- a/launcher/minecraft/MinecraftUpdate.cpp
+++ b/launcher/minecraft/MinecraftUpdate.cpp
@@ -43,7 +43,7 @@ void MinecraftUpdate::executeTask()
     m_tasks.clear();
     // create folders
     {
-        m_tasks.append(std::make_shared<FoldersTask>(m_inst));
+        m_tasks.append(new FoldersTask(m_inst));
     }
 
     // add metadata update task if necessary
@@ -53,23 +53,23 @@ void MinecraftUpdate::executeTask()
         auto task = components->getCurrentTask();
         if(task)
         {
-            m_tasks.append(task.unwrap());
+            m_tasks.append(task);
         }
     }
 
     // libraries download
     {
-        m_tasks.append(std::make_shared<LibrariesTask>(m_inst));
+        m_tasks.append(new LibrariesTask(m_inst));
     }
 
     // FML libraries download and copy into the instance
     {
-        m_tasks.append(std::make_shared<FMLLibrariesTask>(m_inst));
+        m_tasks.append(new FMLLibrariesTask(m_inst));
     }
 
     // assets update
     {
-        m_tasks.append(std::make_shared<AssetUpdateTask>(m_inst));
+        m_tasks.append(new AssetUpdateTask(m_inst));
     }
 
     if(!m_preFailure.isEmpty())
diff --git a/launcher/minecraft/MinecraftUpdate.h b/launcher/minecraft/MinecraftUpdate.h
index acf2eb86..c9cf8624 100644
--- a/launcher/minecraft/MinecraftUpdate.h
+++ b/launcher/minecraft/MinecraftUpdate.h
@@ -50,7 +50,7 @@ private:
 
 private:
     MinecraftInstance *m_inst = nullptr;
-    QList<std::shared_ptr<Task>> m_tasks;
+    QList<Task::Ptr> m_tasks;
     QString m_preFailure;
     int m_currentTask = -1;
     bool m_abort = false;
diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp
index a5c6f542..73d570f1 100644
--- a/launcher/minecraft/auth/MinecraftAccount.cpp
+++ b/launcher/minecraft/auth/MinecraftAccount.cpp
@@ -238,7 +238,7 @@ void MinecraftAccount::authFailed(QString reason)
 }
 
 bool MinecraftAccount::isActive() const {
-    return m_currentTask;
+    return !m_currentTask.isNull();
 }
 
 bool MinecraftAccount::shouldRefresh() const {