[Bf-blender-cvs] [1628a6858e2] master: Fix crash in owmn previous commit.

[Bastien Montagne]

Commit: 1628a6858e22d5e49798f84576283debc5cf2819
Author: Bastien Montagne
Date:   Tue Jun 5 17:51:17 2018 +0200
Branches: master
https://developer.blender.org/rB1628a6858e22d5e49798f84576283debc5cf2819

Fix crash in owmn previous commit.

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

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 66080e3722f..ffc6a566ced 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -656,7 +656,7 @@ int wm_homefile_read(
         bool use_factory_settings, bool use_empty_data, bool use_userdef,
         const char *filepath_startup_override, const char *app_template_override)
 {
-	Main *bmain = CTX_data_main(C);
+	Main *bmain = G.main;  /* Context does not always have valid main pointer here... */
 	ListBase wmbase;
 	bool success = false;
 
@@ -848,9 +848,11 @@ int wm_homefile_read(
 	 * can remove this eventually, only in a 2.53 and older, now its not written */
 	G.fileflags &= ~G_FILE_RELATIVE_REMAP;
 	
+	bmain = CTX_data_main(C);
+
 	if (use_userdef) {
 		/* check userdef before open window, keymaps etc */
-		wm_init_userdef(CTX_data_main(C), read_userdef_from_memory);
+		wm_init_userdef(bmain, read_userdef_from_memory);
 	}
 	
 	/* match the read WM with current WM */