[Bf-blender-cvs] [d6d76759f84] master: Fix error in Main cleanup

[Campbell Barton]

Commit: d6d76759f8493ca156c597840f9d41a64e326eba
Author: Campbell Barton
Date:   Fri Dec 7 15:40:38 2018 +1100
Branches: master
https://developer.blender.org/rBd6d76759f8493ca156c597840f9d41a64e326eba

Fix error in Main cleanup

See 481cdb08ed6f3

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

M	source/blender/blenkernel/BKE_library.h
M	source/blender/windowmanager/intern/wm_files.c

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

diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index c2b971a91cd..2ab9ac3ee58 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -174,8 +174,10 @@ struct BlendThumbnail *BKE_main_thumbnail_from_imbuf(struct Main *bmain, struct
 struct ImBuf *BKE_main_thumbnail_to_imbuf(struct Main *bmain, struct BlendThumbnail *data);
 void BKE_main_thumbnail_create(struct Main *bmain);
 
-const char *BKE_main_blendfile_path(const struct Main *bmain) ATTR_NONNULL();
-const char *BKE_main_blendfile_path_from_global(void);
+const char *BKE_main_blendfile_path(const struct Main *bmain)
+	ATTR_NONNULL(1) ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL;
+const char *BKE_main_blendfile_path_from_global(void)
+	ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL;
 
 void BKE_main_id_tag_idcode(struct Main *mainvar, const short type, const int tag, const bool value);
 void BKE_main_id_tag_listbase(struct ListBase *lb, const int tag, const bool value);
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index effd1c89077..91b04c982fc 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -578,7 +578,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
 		Main *bmain = CTX_data_main(C);
 
 		/* when loading startup.blend's, we can be left with a blank path */
-		if (BKE_main_blendfile_path(bmain)) {
+		if (BKE_main_blendfile_path(bmain)[0] != '\0') {
 			G.save_over = 1;
 		}
 		else {