blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix OS X user preferences open crash when changing virtual pixel size. 

The separate window state setting caused a crash due to doing live resize code
redrawing a window that has not yet been fully initialized.
This commit is contained in:
Brecht Van Lommel 2015-10-27 20:03:20 +01:00
parent 1617f3e425
commit 68f677e655
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/windowmanager/intern/wm_window.c
View File

@ -412,7 +412,12 @@ static void wm_window_ghostwindow_add(wmWindowManager *wm, const char *title, wm
ghostwin = GHOST_CreateWindow(g_system, title,
win->posx, posy, win->sizex, win->sizey,
#ifdef __APPLE__
/* we agreed to not set any fullscreen or iconized state on startup */
GHOST_kWindowStateNormal,
#else
(GHOST_TWindowState)win->windowstate,
#endif
GHOST_kDrawingContextTypeOpenGL,
glSettings);
@ -431,11 +436,6 @@ static void wm_window_ghostwindow_add(wmWindowManager *wm, const char *title, wm
if (win->eventstate == NULL)
win->eventstate = MEM_callocN(sizeof(wmEvent), "window event state");
#ifdef __APPLE__
/* set the state here, else OSX would not recognize changed screen resolution */
/* we agreed to not set any fullscreen or iconized state on startup */
GHOST_SetWindowState(ghostwin, GHOST_kWindowStateNormal);
#endif
/* store actual window size in blender window */
bounds = GHOST_GetClientBounds(win->ghostwin);
win->sizex = GHOST_GetWidthRectangle(bounds);