diff options
| author | Remco Burema <41987080+rburema@users.noreply.github.com> | 2022-05-27 17:00:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-27 17:00:25 +0300 |
| commit | aa9ddd0fbec4fa69377c0ac81cf05c34c85000f3 (patch) | |
| tree | 9f98041a7edc2f8919fb5d0522820a766f9b730b | |
| parent | 1230b0ecaff71301539d7136ca6fc6ad439886c5 (diff) | |
| parent | d6a1cccbdbf7ad3b9fdf2d663eaf349eabdf2620 (diff) | |
Merge pull request #12336 from Ultimaker/SEC-253_resource_preference_injection
[SEC-253] [CURA-8964] resource preference injection
| -rwxr-xr-x | cura/CuraApplication.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 8dc0e966f8..564cac4bfc 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -260,6 +260,7 @@ class CuraApplication(QtApplication): from UM.CentralFileStorage import CentralFileStorage CentralFileStorage.setIsEnterprise(ApplicationMetadata.IsEnterpriseVersion) + Resources.setIsEnterprise(ApplicationMetadata.IsEnterpriseVersion) @pyqtProperty(str, constant=True) def ultimakerCloudApiRootUrl(self) -> str: @@ -351,12 +352,12 @@ class CuraApplication(QtApplication): Resources.addExpectedDirNameInData(dir_name) app_root = os.path.abspath(os.path.join(os.path.dirname(sys.executable))) - Resources.addSearchPath(os.path.join(app_root, "share", "cura", "resources")) + Resources.addSecureSearchPath(os.path.join(app_root, "share", "cura", "resources")) - Resources.addSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources")) + Resources.addSecureSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources")) if not hasattr(sys, "frozen"): resource_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources") - Resources.addSearchPath(resource_path) + Resources.addSecureSearchPath(resource_path) @classmethod def _initializeSettingDefinitions(cls): |