From dd14a8e685997b98394d09ff48bff8591ab4a477 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Mon, 14 May 2018 14:44:40 +0200 Subject: [PATCH] CURA-5296 Better finding for packages.json --- cura/CuraApplication.py | 4 +++- cura/CuraPackageManager.py | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 6b2664debb..4888837fdf 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -151,7 +151,9 @@ class CuraApplication(QtApplication): Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura", "resources")) if not hasattr(sys, "frozen"): - Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources")) + resource_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources") + Resources.addSearchPath(resource_path) + Resources.setBundledResourcesPath(resource_path) self._use_gui = True self._open_file_queue = [] # Files to open when plug-ins are loaded. diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 04175edeb6..2b91081e4d 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -30,9 +30,7 @@ class CuraPackageManager(QObject): # JSON file that keeps track of all installed packages. self._bundled_package_management_file_path = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - "..", - "resources", + os.path.abspath(Resources.getBundledResourcesPath()), "packages.json" ) self._user_package_management_file_path = os.path.join(