diff --git a/autotests/integration/modifier_only_shortcut_test.cpp b/autotests/integration/modifier_only_shortcut_test.cpp index f9a166a0f3..68feb70ac1 100644 --- a/autotests/integration/modifier_only_shortcut_test.cpp +++ b/autotests/integration/modifier_only_shortcut_test.cpp @@ -347,7 +347,6 @@ void ModifierOnlyShortcutTest::testGlobalShortcutsDisabled() // Should not get triggered kwinApp()->platform()->keyboardKeyPressed(modifier, timestamp++); kwinApp()->platform()->keyboardKeyReleased(modifier, timestamp++); - QEXPECT_FAIL("", "BUG 370146", Continue); QCOMPARE(triggeredSpy.count(), 0); triggeredSpy.clear(); diff --git a/keyboard_input.cpp b/keyboard_input.cpp index b960f4280e..6c3a457042 100644 --- a/keyboard_input.cpp +++ b/keyboard_input.cpp @@ -310,7 +310,8 @@ void Xkb::updateKey(uint32_t key, InputRedirection::KeyboardKeyState state) } else { m_modOnlyShortcut.pressCount--; if (m_modOnlyShortcut.pressCount == 0 && - m_modifiers == Qt::NoModifier) { + m_modifiers == Qt::NoModifier && + !workspace()->globalShortcutsDisabled()) { if (m_modOnlyShortcut.modifier != Qt::NoModifier) { const auto list = options->modifierOnlyDBusShortcut(m_modOnlyShortcut.modifier); if (list.size() >= 4) {