Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/cura
diff options
context:
space:
mode:
authorGhostkeeper <rubend@tutanota.com>2022-05-10 19:10:32 +0300
committerGhostkeeper <rubend@tutanota.com>2022-05-10 19:10:32 +0300
commit4fd0d34b1cfaab47d71cedd90a2d65e0decd193e (patch)
tree8fb2ae03da851d73a0d0e011b0a4bd6416b77b5f /cura
parentf05e067f39604b481b7af836d5958ecb06398342 (diff)
Remove extra resource path from Python fileCURA-9147_double_resource_paths
This was recently added. However it appears that we have the same path multiple times in the resources, leading to the resources being found twice. This would normally get removed by virtue of being a set, but not this time since it's a different way of writing the same path. For the themes, it finds the following paths (in my unpacked directory): {'/home/trin/tempy/cura5/UM/../share/uranium/resources/themes', '/home/trin/tempy/cura5/cura/../share/cura/resources/themes', '/home/trin/tempy/cura5/share/cura/resources/themes', '/home/trin/.local/share/cura/5.0/themes', '/home/trin/tempy/cura5/share/uranium/resources/themes'} For both Cura and Uranium, this points to /home/trin/tempy/cura5/curanium/resources/themes twice. So let's remove this one. Contributes to issue CURA-9147.
Diffstat (limited to 'cura')
-rwxr-xr-xcura/CuraApplication.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index a242aa5363..ee3c6e361e 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -349,7 +349,6 @@ class CuraApplication(QtApplication):
app_root = os.path.abspath(os.path.join(os.path.dirname(sys.executable)))
Resources.addSearchPath(os.path.join(app_root, "share", "cura", "resources"))
- Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "share", "cura", "resources"))
Resources.addSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources"))
if not hasattr(sys, "frozen"):