[vlc-commits] macosx: fix order of hotkey modifiers

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Apr 23 10:44:30 2016 +0200| [498517d578c92ecf58956dc05344ec43c2f6a7db] | committer: David Fuhrmann

macosx: fix order of hotkey modifiers

Current convention in blacklist and default key entries is
first Command, then Ctrl, Shift, Alt.
This fixes detection of some blacklisted key combinations.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=498517d578c92ecf58956dc05344ec43c2f6a7db
---

 modules/gui/macosx/simple_prefs.m |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 077ad1e..cd5386e 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -1548,14 +1548,14 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
     NSUInteger i_modifiers = [theEvent modifierFlags];
 
     /* modifiers */
+    if (i_modifiers & NSCommandKeyMask)
+        [tempString appendString:@"Command-"];
     if (i_modifiers & NSControlKeyMask)
         [tempString appendString:@"Ctrl-"];
-    if (i_modifiers & NSAlternateKeyMask )
-        [tempString appendString:@"Alt-"];
     if (i_modifiers & NSShiftKeyMask)
         [tempString appendString:@"Shift-"];
-    if (i_modifiers & NSCommandKeyMask)
-        [tempString appendString:@"Command-"];
+    if (i_modifiers & NSAlternateKeyMask)
+        [tempString appendString:@"Alt-"];
 
     /* non character keys */
     if (key == NSUpArrowFunctionKey)