diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-29 12:20:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-29 12:20:53 +0300 |
| commit | 2be098a1a02da30617516d32e6cd1409644c005e (patch) | |
| tree | cdb437a3da41d0b9a28b49dc8a517f0f7cb5c597 /source/blender/windowmanager/intern/wm_window.c | |
| parent | ff3e1fa7609f3371b8a93251ab7b7c53a2227382 (diff) | |
| parent | c2d3bb709044b7a2730b9fb5005657f38eaff6f2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_window.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 49fe3a1d015..151c21d3cdd 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -336,7 +336,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; |