fix instance IDs and resource pack imports

Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>

3 files changed, 5 insertions, 4 deletions

diff --git a/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp b/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp
index 4f87bc13..d744c535 100644
--- a/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp
@@ -152,7 +152,7 @@ bool LocalResourcePackParseTask::abort()
 
 void LocalResourcePackParseTask::executeTask()
 {
-    Q_ASSERT(m_resource_pack.valid());
+    // Q_ASSERT(m_resource_pack.valid());
 
     if (!ResourcePackUtils::process(m_resource_pack))
         return;
diff --git a/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp b/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
index bf1e308f..f23117ee 100644
--- a/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
@@ -143,7 +143,7 @@ bool LocalTexturePackParseTask::abort()
 
 void LocalTexturePackParseTask::executeTask()
 {
-    Q_ASSERT(m_texture_pack.valid());
+    // Q_ASSERT(m_texture_pack.valid());
 
     if (!TexturePackUtils::process(m_texture_pack))
         return;
diff --git a/launcher/ui/dialogs/ImportResourcePackDialog.cpp b/launcher/ui/dialogs/ImportResourcePackDialog.cpp
index ef76445c..4fe28540 100644
--- a/launcher/ui/dialogs/ImportResourcePackDialog.cpp
+++ b/launcher/ui/dialogs/ImportResourcePackDialog.cpp
@@ -7,6 +7,7 @@
 #include "Application.h"
 #include "InstanceList.h"
 
+#include <InstanceList.h>
 #include "ui/instanceview/InstanceDelegate.h"
 
 ImportResourcePackDialog::ImportResourcePackDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ImportResourcePackDialog)
@@ -40,7 +41,7 @@ ImportResourcePackDialog::ImportResourcePackDialog(QWidget* parent) : QDialog(pa
 
 void ImportResourcePackDialog::activated(QModelIndex index)
 {
-    selectedInstanceKey = index.data(Qt::UserRole).toString();
+    selectedInstanceKey = index.data(InstanceList::InstanceIDRole).toString();
     accept();
 }
 
@@ -49,7 +50,7 @@ void ImportResourcePackDialog::selectionChanged(QItemSelection selected, QItemSe
     if (selected.empty())
         return;
 
-    QString key = selected.first().indexes().first().data(Qt::UserRole).toString();
+    QString key = selected.first().indexes().first().data(InstanceList::InstanceIDRole).toString();
     if (!key.isEmpty()) {
         selectedInstanceKey = key;
     }