From 50f123490f6be17c34003f93c032ddc42d634765 Mon Sep 17 00:00:00 2001 From: M2j Date: Wed, 9 Jun 2010 23:50:55 +0200 Subject: [PATCH] fix: verses in comboBox of editverseform --- openlp/plugins/songs/forms/__init__.py | 2 ++ openlp/plugins/songs/forms/editverseform.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/__init__.py b/openlp/plugins/songs/forms/__init__.py index a336db465..18b83525b 100644 --- a/openlp/plugins/songs/forms/__init__.py +++ b/openlp/plugins/songs/forms/__init__.py @@ -74,6 +74,8 @@ class VerseType(object): elif verse_type == \ unicode(VerseType.to_string(VerseType.Other)).lower(): return VerseType.Other + else: + return -1 from authorsform import AuthorsForm from topicsform import TopicsForm diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index 56bb5de91..27ec39aed 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -104,7 +104,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): verse_type = match.group(1) verse_number = int(match.group(2)) verse_type_index = VerseType.from_string(verse_type) - if verse_type_index: + if verse_type_index >= 0: self.VerseTypeComboBox.setCurrentIndex(verse_type_index) self.VerseNumberBox.setValue(verse_number)