[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59962] trunk/blender/source/blender/ windowmanager/intern/wm_window.c: Fix #36593: crash duplicating window on OS X in some situations.

[Brecht Van Lommel]

Revision: 59962
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59962
Author:   blendix
Date:     2013-09-09 16:55:35 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
Fix #36593: crash duplicating window on OS X in some situations. User data
should be set before GHOST_SetWindowState, since this may generate an event.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_window.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-09-09 16:24:23 UTC (rev 59961)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-09-09 16:55:35 UTC (rev 59962)
@@ -375,12 +375,12 @@
 		/* needed so we can detect the graphics card below */
 		GPU_extensions_init();
 		
+		win->ghostwin = ghostwin;
+		GHOST_SetWindowUserData(ghostwin, win); /* pointer back */
+		
 		/* set the state*/
 		GHOST_SetWindowState(ghostwin, (GHOST_TWindowState)win->windowstate);
 
-		win->ghostwin = ghostwin;
-		GHOST_SetWindowUserData(ghostwin, win); /* pointer back */
-		
 		if (win->eventstate == NULL)
 			win->eventstate = MEM_callocN(sizeof(wmEvent), "window event state");