CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #607 from flowln/dont_crash_on_zip_import

Browse Source 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/609
This commit is contained in:
flow
2022-12-16 07:22:22 -08:00
committed by Sefa Eyeoglu
parent 94410352f5
commit 040774d67b
3 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/modplatform/flame/FlameInstanceCreationTask.cpp
View File

@ -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);

4
launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
View File

@ -217,7 +217,9 @@ bool ModrinthCreationTask::createInstance()
instance.setIconKey("modrinth");
}
instance.setManagedPack("modrinth", m_managed_id, m_managed_name, m_managed_version_id, version());
// Don't add managed info to packs without an ID (most likely imported from ZIP)
if (!m_managed_id.isEmpty())
instance.setManagedPack("modrinth", m_managed_id, m_managed_name, m_managed_version_id, version());
instance.setName(name());
instance.saveNow();