From 041fa2b3592e015eebe779169c9d7f4565b3a788 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Wed, 10 Feb 2016 13:52:05 +0100
Subject: [PATCH] Import Arcus before importing Cura (and PyQt5)

Workaround an issue on certain Linux systems that causes a race
condition between Arcus and PyQt5.

Contributes to CURA-434
---
 cura_app.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/cura_app.py b/cura_app.py
index 831582687c..e19147c5e5 100755
--- a/cura_app.py
+++ b/cura_app.py
@@ -12,15 +12,12 @@ def exceptHook(type, value, traceback):
 
 sys.excepthook = exceptHook
 
-try:
-    from google.protobuf.pyext import _message
-except ImportError:
-    pass
-else:
-    os.environ["PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION"] = "cpp"
-
-if True: # To make the code style checker stop complaining
-    import cura.CuraApplication
+# 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
+import cura.CuraApplication
 
 if sys.platform == "win32" and hasattr(sys, "frozen"):
     import os