[Haiku-commits] r31160 - haiku/trunk/src/servers/app

anevilyak at BerliOS anevilyak at mail.berlios.de
Sun Jun 21 21:33:08 CEST 2009


Author: anevilyak
Date: 2009-06-21 21:33:07 +0200 (Sun, 21 Jun 2009)
New Revision: 31160
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=31160&view=rev

Modified:
   haiku/trunk/src/servers/app/Desktop.cpp
Log:
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.



Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp	2009-06-21 17:04:32 UTC (rev 31159)
+++ haiku/trunk/src/servers/app/Desktop.cpp	2009-06-21 19:33:07 UTC (rev 31160)
@@ -147,7 +147,8 @@
 		&& 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;
 		}




More information about the Haiku-commits mailing list