[Bf-blender-cvs] [a7ca9918414] master: Fix crash closing window in background mode

Campbell Barton noreply at git.blender.org
Wed Mar 29 11:11:30 CEST 2017


Commit: a7ca9918414f87aa55aa1eaeba66c5728f45117f
Author: Campbell Barton
Date:   Wed Mar 29 19:25:34 2017 +1100
Branches: master
https://developer.blender.org/rBa7ca9918414f87aa55aa1eaeba66c5728f45117f

Fix crash closing window in background mode

===================================================================

M	source/blender/windowmanager/intern/wm_window.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 40baab8809c..51f501e0486 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -312,7 +312,7 @@ void wm_window_close(bContext *C, wmWindowManager *wm, wmWindow *win)
 	if (tmpwin == NULL)
 		do_exit = 1;
 	
-	if ((U.uiflag & USER_QUIT_PROMPT) && !wm->file_saved) {
+	if ((U.uiflag & USER_QUIT_PROMPT) && !wm->file_saved && !G.background) {
 		if (do_exit) {
 			if (!GHOST_confirmQuit(win->ghostwin))
 				return;




More information about the Bf-blender-cvs mailing list