From 8960b5740f04714558f2cde2bb4b19ebf687f3aa Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sun, 7 Jan 2007 12:19:08 +0000 Subject: [PATCH] (svn r7955) -Backport from trunk (r7886): - [osx] control+enter no longer fullscreens, interfered with team-chat. --- video/cocoa_v.m | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/video/cocoa_v.m b/video/cocoa_v.m index bf94688731..ba36f85e06 100644 --- a/video/cocoa_v.m +++ b/video/cocoa_v.m @@ -337,10 +337,7 @@ static void QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL dow case QZ_RETURN: case QZ_f: - if (down && ( - (_cocoa_video_data.current_mods & NSControlKeyMask) || - (_cocoa_video_data.current_mods & NSCommandKeyMask) - )) { + if (down && (_cocoa_video_data.current_mods & NSCommandKeyMask)) { CocoaVideoFullScreen(!_fullscreen); } break;