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
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2020-02-24 19:08:19 +0300
committerJaime van Kessel <nallath@gmail.com>2020-02-24 19:08:19 +0300
commit1b65e47beae2c7bab359fd4b6857ab4cce01ef63 (patch)
treecaa7f26622115710565124a0411a5fb9abfff7ce /cura_app.py
parent77f0ff588f7c9d4206dbf53e24d146e42f1a68c5 (diff)
Move imports of Arcus & Savitar up
This was needed due to the crashhandler being imported CURA-7245
Diffstat (limited to 'cura_app.py')
-rwxr-xr-xcura_app.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/cura_app.py b/cura_app.py
index 422313131b..5101f64c46 100755
--- a/cura_app.py
+++ b/cura_app.py
@@ -8,6 +8,13 @@ import faulthandler
import os
import sys
+# Workaround for a race condition on certain systems where there
+# is a race condition between Arcus and PyQt. Importing Arcus
+# first seems to prevent Sip from going into a state where it
+# tries to create PyQt objects on a non-main thread.
+import Arcus # @UnusedImport
+import Savitar # @UnusedImport
+
from UM.Platform import Platform
from cura import ApplicationMetadata
from cura.ApplicationMetadata import CuraAppName
@@ -168,12 +175,7 @@ if sys.stderr:
else:
faulthandler.enable(file = sys.stdout, all_threads = True)
-# Workaround for a race condition on certain systems where there
-# is a race condition between Arcus and PyQt. Importing Arcus
-# first seems to prevent Sip from going into a state where it
-# tries to create PyQt objects on a non-main thread.
-import Arcus #@UnusedImport
-import Savitar #@UnusedImport
+
from cura.CuraApplication import CuraApplication