blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix crash closing a window in background mode

This commit is contained in:
Campbell Barton 2020-03-26 12:46:25 +11:00
parent 7354f07ead
commit ffd26b420c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,7 +414,7 @@ void wm_quit_with_optional_confirmation_prompt(bContext *C, wmWindow *win)
void wm_window_close(bContext *C, wmWindowManager *wm, wmWindow *win)
{
wmWindow *win_other;
const bool is_dialog = GHOST_IsDialogWindow(win->ghostwin);
const bool is_dialog = (G.background == false) ? GHOST_IsDialogWindow(win->ghostwin) : false;
/* First check if there is another main window remaining. */
for (win_other = wm->windows.first; win_other; win_other = win_other->next) {
@ -434,9 +434,13 @@ void wm_window_close(bContext *C, wmWindowManager *wm, wmWindow *win)
if (iter_win->parent == win) {
wm_window_close(C, wm, iter_win);
}
else if (is_dialog && iter_win != win && iter_win->parent &&
(GHOST_GetWindowState(iter_win->ghostwin) != GHOST_kWindowStateMinimized)) {
wm_window_raise(iter_win);
else {
if (G.background == false) {
if (is_dialog && iter_win != win && iter_win->parent &&
(GHOST_GetWindowState(iter_win->ghostwin) != GHOST_kWindowStateMinimized)) {
wm_window_raise(iter_win);
}
}
}
}