Fix T52396: Crash loading template w/o config dir
authorCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 12:06:42 +0000 (22:06 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 12:06:42 +0000 (22:06 +1000)
source/blender/windowmanager/intern/wm_files.c

index 8c24110dc254f22dfafc9ce9b306809448c4b64d..637ace9cd823470df7562d569691cec474dcd72b 100644 (file)
@@ -738,13 +738,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';