[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60456] trunk/blender/source/blender/ windowmanager/intern/wm_window.c: Fix #36852: duplicate window crash on OS X, another case where it could crash

[Brecht Van Lommel]

Revision: 60456
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60456
Author:   blendix
Date:     2013-09-30 22:07:14 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
Fix #36852: duplicate window crash on OS X, another case where it could crash
when changing the window state raises an event, and the window isn't fully
initialized yet.

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-30 21:14:00 UTC (rev 60455)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-09-30 22:07:14 UTC (rev 60456)
@@ -378,12 +378,12 @@
 		win->ghostwin = ghostwin;
 		GHOST_SetWindowUserData(ghostwin, win); /* pointer back */
 		
-		/* set the state*/
-		GHOST_SetWindowState(ghostwin, (GHOST_TWindowState)win->windowstate);
-
 		if (win->eventstate == NULL)
 			win->eventstate = MEM_callocN(sizeof(wmEvent), "window event state");
 		
+		/* set the state */
+		GHOST_SetWindowState(ghostwin, (GHOST_TWindowState)win->windowstate);
+
 		/* until screens get drawn, make it nice gray */
 		glClearColor(0.55, 0.55, 0.55, 0.0);
 		/* Crash on OSS ATI: bugs.launchpad.net/ubuntu/+source/mesa/+bug/656100 */