Merge pull request #295 from davidlatwe/master

Hot fix for v1.8.0
pyblish · Aug 30, 2018 · 18843b9 · 18843b9
2 parents 9ee8682 + 0b86d60
commit 18843b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/pyblish_qml/host.py b/pyblish_qml/host.py
@@ -69,8 +69,6 @@ def install(modal, foster):
     install_callbacks()
     install_host(use_threaded_wrapper)
 
-    install_event_filter()
-
     _state["installed"] = True
 
 
@@ -278,7 +276,10 @@ def install_host(use_threaded_wrapper):
 
 def install_event_filter():
 
-    main_window = _state["vesselParent"]
+    main_window = _state.get("vesselParent")
+    if main_window is None:
+        raise Exception("Main window not found, event filter did not "
+                        "install. This is a bug.")
 
     try:
         host_event_filter = HostEventFilter(main_window)
@@ -412,6 +413,8 @@ def threaded_wrapper(func, *args, **kwargs):
             for widget in QtWidgets.QApplication.topLevelWidgets()
         }["MayaWindow"]
 
+        install_event_filter()
+
     _set_host_label("Maya")
 
 
@@ -426,6 +429,8 @@ def _common_setup(host_name, threaded_wrapper, use_threaded_wrapper):
     app.aboutToQuit.connect(_on_application_quit)
     _acquire_host_main_window(app)
 
+    install_event_filter()
+
     _set_host_label(host_name)
 
 

diff --git a/pyblish_qml/version.py b/pyblish_qml/version.py
@@ -1,7 +1,7 @@
 
 VERSION_MAJOR = 1
 VERSION_MINOR = 8
-VERSION_PATCH = 0
+VERSION_PATCH = 1
 
 version_info = (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
 version = '%i.%i.%i' % version_info