aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/flame
diff options
context:
space:
mode:
authorflow <flowlnlnln@gmail.com>2022-12-16 07:22:22 -0800
committerGitHub <noreply@github.com>2022-12-16 07:22:22 -0800
commitee67b5f1ad1a273b44e15ef0bf37f9b5c202f9a0 (patch)
tree33e4efbbecbead931f07e78abeb22169d93d699e /launcher/modplatform/flame
parentfdac978c842ed3a2ddec61603011abb881305a3a (diff)
parent5450e0edf305090c2cab81e335c8d5366d7f1f13 (diff)
downloadPrismLauncher-ee67b5f1ad1a273b44e15ef0bf37f9b5c202f9a0.tar.gz
PrismLauncher-ee67b5f1ad1a273b44e15ef0bf37f9b5c202f9a0.tar.bz2
PrismLauncher-ee67b5f1ad1a273b44e15ef0bf37f9b5c202f9a0.zip
Merge pull request #607 from flowln/dont_crash_on_zip_import
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/609
Diffstat (limited to 'launcher/modplatform/flame')
-rw-r--r--launcher/modplatform/flame/FlameInstanceCreationTask.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 729268d7..1d441f09 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -361,7 +361,9 @@ bool FlameCreationTask::createInstance()
FS::deletePath(jarmodsPath);
}
- instance.setManagedPack("flame", m_managed_id, m_pack.name, m_managed_version_id, m_pack.version);
+ // Don't add managed info to packs without an ID (most likely imported from ZIP)
+ if (!m_managed_id.isEmpty())
+ instance.setManagedPack("flame", m_managed_id, m_pack.name, m_managed_version_id, m_pack.version);
instance.setName(name());
m_mod_id_resolver = new Flame::FileResolvingTask(APPLICATION->network(), m_pack);