From 3c71998e34d887bd4a4cb3c191fea50f163b6a6f Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 4 Jun 2024 11:44:08 +0200 Subject: [PATCH] PluginManager: Fix -load all -noload Plugin Setting a plugin forceDisabled must also remove the forceEnabled flag and vice versa. Broke in b39b1925189416585933c017e189d04d6e4c478d Change-Id: I9c2b84de0753a1b283c301b9868650e62c088144 Reviewed-by: Christian Stenger --- src/libs/extensionsystem/pluginspec.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp index 2158b99ac27..18c8d11e78f 100644 --- a/src/libs/extensionsystem/pluginspec.cpp +++ b/src/libs/extensionsystem/pluginspec.cpp @@ -627,10 +627,14 @@ void PluginSpec::setEnabledIndirectly(bool value) } void PluginSpec::setForceDisabled(bool value) { + if (value) + d->forceEnabled = false; d->forceDisabled = value; } void PluginSpec::setForceEnabled(bool value) { + if (value) + d->forceDisabled = false; d->forceEnabled = value; }