diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 15:06:42 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-09-04 13:58:41 +0300 |
| commit | 76e8dcafa3c968b51e0692e31f51db6fd50750db (patch) | |
| tree | 28a911d010b486ce307781fec861f3e98b5c52f6 | |
| parent | 73cdf00ea8193a48ab48ec22422273e924b97259 (diff) | |
Fix T52396: Crash loading template w/o config dir
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 |
1 files changed, 1 insertions, 1 deletions
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'; |