[Bf-blender-cvs] [9e3ff9e059b] master: Fix T67334: Blender does not exit after saving

[Jacques Lucke]

Commit: 9e3ff9e059baf3cd87aa0fe7ee8081f63df1674f
Author: Jacques Lucke
Date:   Tue Jul 23 14:32:32 2019 +0200
Branches: master
https://developer.blender.org/rB9e3ff9e059baf3cd87aa0fe7ee8081f63df1674f

Fix T67334: Blender does not exit after saving

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

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

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

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 48b09b0d329..fd3e7a2d3fc 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -2956,7 +2956,8 @@ static void wm_block_file_close_save(bContext *C, void *arg_block, void *arg_dat
   wmWindow *win = CTX_wm_window(C);
   UI_popup_block_close(C, win, arg_block);
 
-  if (save_images_when_file_is_closed) {
+  int modified_images_count = ED_image_save_all_modified_info(C, NULL);
+  if (modified_images_count > 0 && save_images_when_file_is_closed) {
     if (ED_image_should_save_modified(C)) {
       ReportList *reports = CTX_wm_reports(C);
       ED_image_save_all_modified(C, reports);