diff options
author | Ghostkeeper <rubend@tutanota.com> | 2020-02-25 14:07:47 +0300 |
---|---|---|
committer | Ghostkeeper <rubend@tutanota.com> | 2020-02-25 14:07:47 +0300 |
commit | a1438e91d09da7234273b0eb1fbaabe3ca0d5ebf (patch) | |
tree | 94100e96f22f4d659a51dfca75d3e06d9c003bbf /cura_app.py | |
parent | 2b11152c4d3743759ea4db6c359cbbdc35240278 (diff) | |
parent | 4db66c71ba3dd32bc226686b2fa716ba0a46ae18 (diff) |
Merge branch '4.5'
Conflicts:
cura_app.py -> Due to moving some imports around.
Diffstat (limited to 'cura_app.py')
-rwxr-xr-x | cura_app.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cura_app.py b/cura_app.py index 6149eeeb9a..38d1149080 100755 --- a/cura_app.py +++ b/cura_app.py @@ -8,9 +8,17 @@ 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 +from cura.CrashHandler import CrashHandler try: import sentry_sdk @@ -42,8 +50,9 @@ if with_sentry_sdk: sentry_env = "nightly" except IndexError: pass - + sentry_sdk.init("https://5034bf0054fb4b889f82896326e79b13@sentry.io/1821564", + before_send = CrashHandler.sentryBeforeSend, environment = sentry_env, release = "cura%s" % ApplicationMetadata.CuraVersion, default_integrations = False, @@ -166,13 +175,6 @@ if sys.stderr: elif sys.stdout: 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 |