From f9aff34415ee693ab4ecc75b11528947f73959b9 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 13 Sep 2018 23:50:36 +0200 Subject: [PATCH] restore old behaviour of AddonManager.get_macro_dir --- src/Mod/AddonManager/AddonManager.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py index 45732442a9..4a6516e112 100644 --- a/src/Mod/AddonManager/AddonManager.py +++ b/src/Mod/AddonManager/AddonManager.py @@ -104,7 +104,12 @@ def symlink(source, link_name): def get_macro_dir(): """Return the directory where macros are located""" - return FreeCAD.getUserMacroDir() + default_macro_dir = os.path.join(FreeCAD.ConfigGet('UserAppData'), 'Macro') + path = FreeCAD.ParamGet('User parameter:BaseApp/Preferences/Macro').GetString('MacroPath', default_macro_dir) + # For Py2 path is a utf-8 encoded unicode which we must decode again + if sys.version_info.major < 3: + path = path.decode("utf-8") + return path def update_macro_details(old_macro, new_macro):