[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56685] trunk/blender/intern/ghost/intern/ GHOST_WindowCocoa.mm: Fix for previous fix, not sure it will cause issues in practice but better be

Brecht Van Lommel brechtvanlommel at pandora.be
Sat May 11 14:21:34 CEST 2013


Revision: 56685
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56685
Author:   blendix
Date:     2013-05-11 12:21:33 +0000 (Sat, 11 May 2013)
Log Message:
-----------
Fix for previous fix, not sure it will cause issues in practice but better be
sure to avoid invalid memory access.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-05-11 12:18:12 UTC (rev 56684)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-05-11 12:21:33 UTC (rev 56685)
@@ -283,6 +283,8 @@
 // The trick to prevent Cocoa from complaining (beeping)
 - (void)keyDown:(NSEvent *)event
 {
+	systemCocoa->handleKeyEvent(event);
+
 	/* Start or continue composing? */
 	if ([[event characters] length] == 0  ||
 	    [[event charactersIgnoringModifiers] length] == 0 ||
@@ -297,9 +299,8 @@
 		[self interpretKeyEvents:events]; // calls insertText
 		[events removeObject:event];
 		[events release];
+		return;
 	}
-
-	systemCocoa->handleKeyEvent(event);
 }
 
 - (void)keyUp:(NSEvent *)event




More information about the Bf-blender-cvs mailing list