External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2026-01-02 13:50:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'MultiMC:develop' into develop

Browse Source
This commit is contained in:
Sebastian
2021-12-13 19:11:57 -05:00
committed by GitHub
parent 6336401aea 7d047f9223
commit fc22ddd13d
8 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/minecraft/MinecraftInstance.cpp
View File

@@ -204,7 +204,7 @@ QString MinecraftInstance::jarModsDir() const
return jarmods_dir.absolutePath();
}
QString MinecraftInstance::loaderModsDir() const
QString MinecraftInstance::modsRoot() const
{
return FS::PathCombine(gameRoot(), "mods");
}
@@ -984,7 +984,7 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::loaderModList() const
{
if (!m_loader_mod_list)
{
m_loader_mod_list.reset(new ModFolderModel(loaderModsDir()));
m_loader_mod_list.reset(new ModFolderModel(modsRoot()));
m_loader_mod_list->disableInteraction(isRunning());
connect(this, &BaseInstance::runningStatusChanged, m_loader_mod_list.get(), &ModFolderModel::disableInteraction);
}