mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[Backport release-10.x] fix no name instances (#5159)

Browse source
This commit is contained in:
Alexandru Ionut Tripon 2026-03-10 12:41:06 +02:00 • committed by GitHub
commit 8788b7338a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 166 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

3
launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
View file

@ -994,8 +994,8 @@ void PackInstallTask::install()
auto instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg");
MinecraftInstance instance(m_globalSettings, std::make_unique<INISettingsObject>(instanceConfigPath), m_stagingPath);
{
SettingsObject::Lock lock(instance.settings());
auto components = instance.getPackProfile();
components->buildingFromScratch();
@ -1053,6 +1053,7 @@ void PackInstallTask::install()
instance.setManagedPack("atlauncher", m_pack_safe_name, m_pack_name, m_version_name, m_version_name);
jarmods.clear();
}
emitSucceeded();
}

5
launcher/modplatform/import_ftb/PackInstallTask.cpp
View file

@ -52,8 +52,9 @@ void PackInstallTask::copySettings()
QString instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg");
MinecraftInstance instance(m_globalSettings, std::make_unique<INISettingsObject>(instanceConfigPath), m_stagingPath);
SettingsObject::Lock lock(instance.settings());
{
SettingsObject::Lock lock(instance.settings());
instance.settings()->set("InstanceType", "OneSix");
instance.settings()->set("totalTimePlayed", m_pack.totalPlayTime / 1000);
@ -108,7 +109,7 @@ void PackInstallTask::copySettings()
if (m_instIcon == "default")
m_instIcon = "ftb_logo";
instance.setIconKey(m_instIcon);
}
emitSucceeded();
}

2
launcher/modplatform/legacy_ftb/PackInstallTask.cpp
View file

@ -134,6 +134,7 @@ void PackInstallTask::install()
QString instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg");
MinecraftInstance instance(m_globalSettings, std::make_unique<INISettingsObject>(instanceConfigPath), m_stagingPath);
{
SettingsObject::Lock lock(instance.settings());
auto components = instance.getPackProfile();
@ -203,6 +204,7 @@ void PackInstallTask::install()
m_instIcon = "ftb_logo";
}
instance.setIconKey(m_instIcon);
}
emitSucceeded();
}