From 53b3b394e9e10ded0839aa651ad5e6b1cf6274bc Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 14 Sep 2011 21:27:30 +0100 Subject: [PATCH 1/2] Turn off autopreview when deleting images. Stops images being deleted trying to preview themselves. Fixes: https://launchpad.net/bugs/835033 --- openlp/plugins/images/lib/mediaitem.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index cf217d8dc..cb73a132f 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -99,6 +99,8 @@ class ImageMediaItem(MediaManagerItem): """ Remove an image item from the list """ + # Turn off auto preview triggers. + self.listView.blockSignals(True) if check_item_selected(self.listView, translate('ImagePlugin.MediaItem', 'You must select an image to delete.')): row_list = [item.row() for item in self.listView.selectedIndexes()] @@ -111,6 +113,7 @@ class ImageMediaItem(MediaManagerItem): self.listView.takeItem(row) SettingsManager.set_list(self.settingsSection, u'images', self.getFileList()) + self.listView.blockSignals(False) def loadList(self, images, initialLoad=False): if not initialLoad: From 52c63d96655bf338079c32835ddbe5ad9dd94d75 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 14 Sep 2011 21:35:32 +0100 Subject: [PATCH 2/2] Undo fix --- openlp/core/ui/slidecontroller.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index c71170b32..6615d0e35 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -414,9 +414,8 @@ class SlideController(QtGui.QWidget): translate('OpenLP.SlideController', 'Escape Item')) def liveEscape(self): - if self.display.primary: - self.display.setVisible(False) - self.display.videoStop() + self.display.setVisible(False) + self.display.videoStop() def servicePrevious(self): time.sleep(0.1)