diff --git a/openlp/core/api/versions/v2/core.py b/openlp/core/api/versions/v2/core.py index 02a27afd6..9ce376ca4 100644 --- a/openlp/core/api/versions/v2/core.py +++ b/openlp/core/api/versions/v2/core.py @@ -109,7 +109,6 @@ def login(): def main_image(): live_controller = Registry().get('live_controller') img_data = live_controller.staticMetaObject.invokeMethod( - live_controller, 'grab_maindisplay', QtCore.Qt.ConnectionType.BlockingQueuedConnection, - QtCore.Q_RETURN_ARG(str)) + live_controller, 'grab_maindisplay', QtCore.Qt.ConnectionType.DirectConnection, QtCore.Q_RETURN_ARG(str)) img = 'data:image/jpeg;base64,{}'.format(img_data) return jsonify({'binary_image': img}) diff --git a/openlp/core/api/versions/v2/plugins.py b/openlp/core/api/versions/v2/plugins.py index e20c842c7..10df0f2e0 100644 --- a/openlp/core/api/versions/v2/plugins.py +++ b/openlp/core/api/versions/v2/plugins.py @@ -46,7 +46,7 @@ def search(plugin_name, text): if hasattr(plugin.media_item.search, '__pyqtSignature__'): # If this method has a signature, it means that it should be called from the parent thread results = plugin.media_item.staticMetaObject.invokeMethod( - plugin.media_item, 'search', QtCore.Qt.ConnectionType.BlockingQueuedConnection, + plugin.media_item, 'search', QtCore.Qt.ConnectionType.DirectConnection, QtCore.Q_RETURN_ARG(list), QtCore.Q_ARG(str, text), QtCore.Q_ARG(bool, False)) else: # Fall back to original behaviour diff --git a/tests/openlp_core/api/v2/test_plugins.py b/tests/openlp_core/api/v2/test_plugins.py index ced256f6b..40330958e 100644 --- a/tests/openlp_core/api/v2/test_plugins.py +++ b/tests/openlp_core/api/v2/test_plugins.py @@ -54,7 +54,7 @@ def test_search_threaded(registry, settings): invoke_call = mocked_songs_plugin.media_item.staticMetaObject.invokeMethod.call_args_list[0] assert invoke_call.args[0] is mocked_songs_plugin.media_item assert invoke_call.args[1] == 'search' - assert invoke_call.args[2] == QtCore.Qt.ConnectionType.BlockingQueuedConnection + assert invoke_call.args[2] == QtCore.Qt.ConnectionType.DirectConnection def test_search_unthreaded(registry, settings):