From 0f538250b95fd5e2e9515bbb727448ca3535bbbf Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 15 Dec 2018 08:31:16 +0000 Subject: [PATCH] fixes --- openlp/core/widgets/views.py | 2 +- tests/functional/openlp_core/ui/test_slidecontroller.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/core/widgets/views.py b/openlp/core/widgets/views.py index 0f719becb..e04587185 100644 --- a/openlp/core/widgets/views.py +++ b/openlp/core/widgets/views.py @@ -194,7 +194,7 @@ class ListPreviewWidget(QtWidgets.QTableWidget, RegistryProperties): image = self.image_manager.get_image(frame['image'], ImageSource.CommandPlugins) pixmap = QtGui.QPixmap.fromImage(image) else: - pixmap = None # frame['image'].pixmap(80, 80) + pixmap = frame['image'].pixmap(80, 80) else: image = self.image_manager.get_image(frame['path'], ImageSource.ImagePlugin) pixmap = QtGui.QPixmap.fromImage(image) diff --git a/tests/functional/openlp_core/ui/test_slidecontroller.py b/tests/functional/openlp_core/ui/test_slidecontroller.py index d491b571e..8b731e364 100644 --- a/tests/functional/openlp_core/ui/test_slidecontroller.py +++ b/tests/functional/openlp_core/ui/test_slidecontroller.py @@ -678,6 +678,7 @@ class TestSlideController(TestCase): slide_controller.service_item = mocked_pres_item slide_controller.is_live = False slide_controller.preview_widget = MagicMock() + slide_controller.preview_display = MagicMock() slide_controller.enable_tool_bar = MagicMock() slide_controller.on_media_start = MagicMock() slide_controller.slide_selected = MagicMock()