[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60511] trunk/blender/intern/ghost/intern/ GHOST_SystemCocoa.mm: OSX/GHOST: fix own issue in 60510, should now ( hopefully) cover all multiple window combinations

jens verwiebe info at jensverwiebe.de
Wed Oct 2 21:54:24 CEST 2013


Revision: 60511
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60511
Author:   jensverwiebe
Date:     2013-10-02 19:54:24 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
OSX/GHOST: fix own issue in 60510, should now (hopefully) cover all multiple window combinations

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

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-10-02 19:19:22 UTC (rev 60510)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-10-02 19:54:24 UTC (rev 60511)
@@ -1025,10 +1025,8 @@
 	}
 		switch (eventType) {
 			case GHOST_kEventWindowClose:
-				// make window that should be closed frontmost
-				[window->getCocoaWindow() makeKeyAndOrderFront:nil];
 				// check for index of mainwindow as it would quit blender without dialog and discard
-				if (window->getCocoaWindow() != [windowsList objectAtIndex:([windowsList count] - 1)]) {
+				if ([windowsList count] > 1  && window->getCocoaWindow() != [windowsList objectAtIndex:[windowsList count] - 1]) {
 					pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window) );
 				}
 				else {




More information about the Bf-blender-cvs mailing list