[Bf-blender-cvs] [ceafed75e3] app-templates: Minor correction to recent commit

[Campbell Barton]

Commit: ceafed75e3d121929e37a8c90b53008f26b592a8
Author: Campbell Barton
Date:   Fri Mar 17 20:08:22 2017 +1100
Branches: app-templates
https://developer.blender.org/rBceafed75e3d121929e37a8c90b53008f26b592a8

Minor correction to recent commit

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

M	release/scripts/modules/bl_app_template_utils.py
M	source/blender/windowmanager/intern/wm_files.c

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

diff --git a/release/scripts/modules/bl_app_template_utils.py b/release/scripts/modules/bl_app_template_utils.py
index 134d4e55c5..358b8620ea 100644
--- a/release/scripts/modules/bl_app_template_utils.py
+++ b/release/scripts/modules/bl_app_template_utils.py
@@ -173,6 +173,7 @@ def _disable(template_id, *, handle_error=None):
     if _bpy.app.debug_python:
         print("\tapp_template_utils.disable", template_id)
 
+
 def import_from_path(path, ignore_not_found=False):
     """
     Imports 'startup' from a path.
@@ -186,8 +187,7 @@ def import_from_path(path, ignore_not_found=False):
         except ModuleNotFoundError as ex:
             if ignore_not_found and ex.name == module_name:
                 return None
-            else:
-                raise ex
+            raise ex
 
 
 def import_from_id(template_id, ignore_not_found=False):
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 36c088221d..b4b87e2e0a 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -772,7 +772,7 @@ int wm_homefile_read(
 			UserDef *userdef_template = NULL;
 			/* just avoids missing file warning */
 			if (BLI_exists(temp_path)) {
-				BKE_blendfile_userdef_read(temp_path, NULL);
+				userdef_template = BKE_blendfile_userdef_read(temp_path, NULL);
 			}
 			if (userdef_template == NULL) {
 				/* we need to have preferences load to overwrite preferences from previous template */