diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-12 08:23:38 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-12 08:23:38 +0400 |
commit | 8fd1d53a311b27f5088e9c81ed192b425bcd1837 (patch) | |
tree | 9282c7c992f3b8244b10bf8e64ff03b13761aafc /release | |
parent | 3a73a75e844cf067c92f8c7f8d18065bc413b7b6 (diff) |
change behavior of restoring old settings
- only attempt to restore old 'user' settings (not local), since bundled blender's always use their own settings.
- only automatically run 'bpy.ops.wm.read_homefile()' after copying files if the user hasnt alreadt started making changes in the blend file.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 3ecdb70d2a1..3e0b30c7b6a 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -918,23 +918,24 @@ class WM_OT_copy_prev_settings(bpy.types.Operator): import os import shutil ver = bpy.app.version - ver_prev = ((ver[0] * 100) + ver[1]) - 1 - ver_prev = ver_prev // 100, ver_prev % 100 - for res in ('USER', 'LOCAL'): - path_src = bpy.utils.resource_path(res, ver_prev[0], ver_prev[1]) - path_dst = bpy.utils.resource_path(res) - - if os.path.isdir(path_dst): - self.report({'ERROR'}, "Path %r exists" % path_dst) - return {'CANCELLED'} - else: - break - - if os.path.isdir(path_src): + ver_old = ((ver[0] * 100) + ver[1]) - 1 + path_src = bpy.utils.resource_path('USER', ver_old // 100, ver_old % 100) + path_dst = bpy.utils.resource_path('USER') + + if os.path.isdir(path_dst): + self.report({'ERROR'}, "Target path %r exists" % path_dst) + elif not os.path.isdir(path_src): + self.report({'ERROR'}, "Source path %r exists" % path_src) + else: shutil.copytree(path_src, path_dst) - bpy.ops.wm.read_homefile() + # dont loose users work if they open the splash later. + if bpy.data.is_saved is bpy.data.is_dirty is False: + bpy.ops.wm.read_homefile() + else: + self.report({'INFO'}, "Reload Start-Up file to restore settings.") + return {'FINISHED'} - return {'FINISHED'} + return {'CANCELLED'} def _webbrowser_bug_fix(): |