diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-30 23:58:56 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-30 23:58:56 +0400 |
commit | 15e5d3ef7b455bf4150cb1c52461370a65b1cec9 (patch) | |
tree | 7c1550fd5dd7d68fc713038420df6da14a4f4fb0 /intern/ghost | |
parent | 3ccb370d38cc66bbcf261e0425077ed0988f4c5e (diff) |
Fix #36891: on OS X, cmd+s or cmd+o did not work when pressing them over the
text editor.
Diffstat (limited to 'intern/ghost')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 013d1e09066..f71d87c6f2f 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -1771,6 +1771,10 @@ GHOST_TSuccess GHOST_SystemCocoa::handleKeyEvent(void *eventPtr) if ((keyCode > 266) && (keyCode < 271)) utf8_buf[0] = '\0'; + /* no text with command key pressed */ + if (m_modifierMask & NSCommandKeyMask) + utf8_buf[0] = '\0'; + if ((keyCode == GHOST_kKeyQ) && (m_modifierMask & NSCommandKeyMask)) break; //Cmd-Q is directly handled by Cocoa |