From 322209702952acb582a87a41ab65730c1c1964c8 Mon Sep 17 00:00:00 2001 From: HJfod <60038575+HJfod@users.noreply.github.com> Date: Fri, 24 Feb 2023 20:52:12 +0200 Subject: [PATCH] make getLoadedMod and isModLoaded only return if the mod is also enabled --- loader/src/loader/LoaderImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/src/loader/LoaderImpl.cpp b/loader/src/loader/LoaderImpl.cpp index 1179bb4d..3406a161 100644 --- a/loader/src/loader/LoaderImpl.cpp +++ b/loader/src/loader/LoaderImpl.cpp @@ -252,13 +252,13 @@ Mod* Loader::Impl::getInstalledMod(std::string const& id) const { } bool Loader::Impl::isModLoaded(std::string const& id) const { - return m_mods.count(id) && m_mods.at(id)->isLoaded(); + return m_mods.count(id) && m_mods.at(id)->isLoaded() && m_mods.at(id)->isEnabled(); } Mod* Loader::Impl::getLoadedMod(std::string const& id) const { if (m_mods.count(id)) { auto mod = m_mods.at(id); - if (mod->isLoaded()) { + if (mod->isLoaded() && mod->isEnabled()) { return mod; } }