[Bf-blender-cvs] [76e8dcafa3c] blender-v2.79-release: Fix T52396: Crash loading template w/o config dir

[Campbell Barton]

Commit: 76e8dcafa3c968b51e0692e31f51db6fd50750db
Author: Campbell Barton
Date:   Wed Aug 23 22:06:42 2017 +1000
Branches: blender-v2.79-release
https://developer.blender.org/rB76e8dcafa3c968b51e0692e31f51db6fd50750db

Fix T52396: Crash loading template w/o config dir

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

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 605a226500f..8ef12976211 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -731,13 +731,13 @@ int wm_homefile_read(
 
 	if ((app_template != NULL) && (app_template[0] != '\0')) {
 		BKE_appdir_app_template_id_search(app_template, app_template_system, sizeof(app_template_system));
-		BLI_path_join(app_template_config, sizeof(app_template_config), cfgdir, app_template, NULL);
 
 		/* Insert template name into startup file. */
 
 		/* note that the path is being set even when 'use_factory_settings == true'
 		 * this is done so we can load a templates factory-settings */
 		if (!use_factory_settings) {
+			BLI_path_join(app_template_config, sizeof(app_template_config), cfgdir, app_template, NULL);
 			BLI_path_join(filepath_startup, sizeof(filepath_startup), app_template_config, BLENDER_STARTUP_FILE, NULL);
 			if (BLI_access(filepath_startup, R_OK) != 0) {
 				filepath_startup[0] = '\0';