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

Move imports of Arcus & Savitar up

Browse source 
This was needed due to the crashhandler being imported

CURA-7245
This commit is contained in:
Jaime van Kessel 2020-02-24 17:08:19 +01:00
parent 77f0ff588f
commit 1b65e47bea
No known key found for this signature in database
GPG key ID: 3710727397403C91
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cura_app.py
View file

@ -8,6 +8,13 @@ import faulthandler
import os import os
import sys 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 UM.Platform import Platform
from cura import ApplicationMetadata from cura import ApplicationMetadata
from cura.ApplicationMetadata import CuraAppName from cura.ApplicationMetadata import CuraAppName
@ -168,12 +175,7 @@ if sys.stderr:
else: else:
faulthandler.enable(file = sys.stdout, all_threads = True) 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 from cura.CuraApplication import CuraApplication