openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/b1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/b1/+merge/57209

Fix crash in last change which stopped OpenLP starting

-- 
https://code.launchpad.net/~trb143/openlp/b1/+merge/57209
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/b1 into lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2011-04-10 18:54:26 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2011-04-11 18:19:06 +0000
@@ -322,11 +322,12 @@
                 self.advancedVersionComboBox.addItem(bible)
                 self.advancedSecondComboBox.addItem(bible)
         # set the default value
-        book = QtCore.QSettings().value(
+        bible = QtCore.QSettings().value(
             self.settingsSection + u'/advanced bible',
             QtCore.QVariant(u'')).toString()
-        find_and_set_in_combo_box(self.advancedVersionComboBox, book)
-        self.initialiseAdvancedBible(unicode(book))
+        if bible in bibles:
+            find_and_set_in_combo_box(self.advancedVersionComboBox, bible)
+            self.initialiseAdvancedBible(unicode(book))
 
     def reloadBibles(self):
         log.debug(u'Reloading Bibles')
@@ -840,4 +841,4 @@
             self.settings.layout_style)
         QtCore.QSettings().setValue(
             self.settingsSection + u'/verse layout style',
-            QtCore.QVariant(self.settings.layout_style))
\ No newline at end of file
+            QtCore.QVariant(self.settings.layout_style))