7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-30 03:15:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

dont enable mods on update

Browse source
This commit is contained in:
ConfiG 2023-08-13 14:27:56 +03:00
parent 73169fbf22
commit 6ab542d51a
No known key found for this signature in database
GPG key ID: 44DA1983F524C11B
3 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
loader/src/loader/Index.cpp
View file

@ -651,20 +651,8 @@ void Index::Impl::installNext(size_t index, IndexInstallList const& list) {
item->getMetadata().getID(), res.unwrapErr() item->getMetadata().getID(), res.unwrapErr()
)); ));
} }
// If the mod is already loaded, enable it
if (mod->isLoaded()) {
res = mod->enable();
if (!res) {
return postError(fmt::format(
"Unable to enable {}: {}",
item->getMetadata().getID(), res.unwrapErr()
));
}
}
} }
// Move the temp file // Move the temp file
try { try {
ghc::filesystem::rename( ghc::filesystem::rename(

4
loader/src/loader/LoaderImpl.cpp
View file

@ -202,13 +202,13 @@ Mod* Loader::Impl::getInstalledMod(std::string const& id) const {
} }
bool Loader::Impl::isModLoaded(std::string const& id) const { bool Loader::Impl::isModLoaded(std::string const& id) const {
return m_mods.count(id) && m_mods.at(id)->isLoaded() && m_mods.at(id)->isEnabled(); return m_mods.count(id) && m_mods.at(id)->isLoaded();
} }
Mod* Loader::Impl::getLoadedMod(std::string const& id) const { Mod* Loader::Impl::getLoadedMod(std::string const& id) const {
if (m_mods.count(id)) { if (m_mods.count(id)) {
auto mod = m_mods.at(id); auto mod = m_mods.at(id);
if (mod->isLoaded() && mod->isEnabled()) { if (mod->isLoaded()) {
return mod; return mod;
} }
} }

3
loader/src/ui/internal/list/ModListLayer.cpp
View file

@ -172,7 +172,8 @@ CCArray* ModListLayer::createModCells(ModListType type, ModListQuery const& quer
// newly installed // newly installed
for (auto const& item : Index::get()->getItems()) { for (auto const& item : Index::get()->getItems()) {
if (!item->isInstalled() || if (!item->isInstalled() ||
Loader::get()->isModInstalled(item->getMetadata().getID())) Loader::get()->isModInstalled(item->getMetadata().getID()) ||
Loader::get()->isModLoaded(item->getMetadata().getID()))
continue; continue;
// match the same as other installed mods // match the same as other installed mods
if (auto match = queryMatchKeywords(query, item->getMetadata())) { if (auto match = queryMatchKeywords(query, item->getMetadata())) {