From faafd00c1a37b5ebb26e8238e31cdf4905cd1b60 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sun, 21 Jun 2009 19:33:07 +0000 Subject: [PATCH] Fix broken check for ctrl+cmd+esc that would result in any of ctrl+esc, cmd+esc or ctrl+cmd+esc triggering safe video mode, and as a side effect, prevent menus from being opened via keyboard. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31160 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Desktop.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index e5e0605911..4ea8822462 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -147,7 +147,8 @@ KeyboardFilter::Filter(BMessage* message, EventTarget** _target, && message->FindInt32("key", &key) == B_OK && message->FindInt32("modifiers", &modifiers) == B_OK) { // Check for safe video mode (cmd + ctrl + escape) - if (key == 0x01 && (modifiers & (B_COMMAND_KEY | B_CONTROL_KEY)) != 0) { + if (key == 0x01 && (modifiers & B_COMMAND_KEY) != 0 && + (modifiers & B_CONTROL_KEY) != 0) { system("screenmode --fall-back &"); return B_SKIP_MESSAGE; }