From 48e2ac108d33a95a5d446b0ecec1a05e37611f9a Mon Sep 17 00:00:00 2001 From: Erik Lundin Date: Mon, 29 Oct 2012 00:08:54 +0100 Subject: [PATCH 1/2] Fixed bug #1072498 'VLC: Add webm as supported format' Fixes: https://launchpad.net/bugs/1072498 --- openlp/core/ui/media/vlcplayer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index 93f02a344..5b9e3f414 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -88,7 +88,8 @@ VIDEO_EXT = [ u'*.dts', u'*.xa', u'*.iso', - u'*.vob' + u'*.vob', + u'*.webm' ] From d855b5548487ae08929559275d36d0c096cfdcf6 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Fri, 2 Nov 2012 22:00:14 +0000 Subject: [PATCH 2/2] Fix for bug #1073061 --- openlp/plugins/songs/lib/songimport.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py index e22cf8ab8..c25e6d251 100644 --- a/openlp/plugins/songs/lib/songimport.py +++ b/openlp/plugins/songs/lib/songimport.py @@ -274,9 +274,10 @@ class SongImport(QtCore.QObject): """ Repeat the previous verse in the verse order """ - self.verseOrderListGenerated.append( - self.verseOrderListGenerated[-1]) - self.verseOrderListGeneratedUseful = True + if self.verseOrderListGenerated: + self.verseOrderListGenerated.append( + self.verseOrderListGenerated[-1]) + self.verseOrderListGeneratedUseful = True def checkComplete(self): """