3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #12274 from Ultimaker/SEC-255_fix_theme_5.0

Browse source 
In secure version: disable loading themes from unbundled folders.
This commit is contained in:
Joey de l'Arago 2022-05-23 11:38:11 +02:00 • committed by GitHub
commit 4e5f826a8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/CuraApplication.py
View file

@ -315,7 +315,7 @@ class CuraApplication(QtApplication):
def initialize(self) -> None: def initialize(self) -> None:
self.__addExpectedResourceDirsAndSearchPaths() # Must be added before init of super self.__addExpectedResourceDirsAndSearchPaths() # Must be added before init of super
super().initialize() super().initialize(ApplicationMetadata.IsEnterpriseVersion)
self._preferences.addPreference("cura/single_instance", False) self._preferences.addPreference("cura/single_instance", False)
self._use_single_instance = self._preferences.getValue("cura/single_instance") or self._cli_args.single_instance self._use_single_instance = self._preferences.getValue("cura/single_instance") or self._cli_args.single_instance
@ -942,6 +942,7 @@ class CuraApplication(QtApplication):
self._qml_import_paths.append(Resources.getPath(self.ResourceTypes.QmlFiles)) self._qml_import_paths.append(Resources.getPath(self.ResourceTypes.QmlFiles))
self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Initializing engine...")) self._setLoadingHint(self._i18n_catalog.i18nc("@info:progress", "Initializing engine..."))
self.initializeEngine() self.initializeEngine()
self.getTheme().setCheckIfTrusted(ApplicationMetadata.IsEnterpriseVersion)
# Initialize UI state # Initialize UI state
controller.setActiveStage("PrepareStage") controller.setActiveStage("PrepareStage")