From 1b65e47beae2c7bab359fd4b6857ab4cce01ef63 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 24 Feb 2020 17:08:19 +0100 Subject: [PATCH] Move imports of Arcus & Savitar up This was needed due to the crashhandler being imported CURA-7245 --- cura_app.py | 14 ++++++++------ 1 file 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