openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-1194622-2.0 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1194622 in OpenLP: "[support-system] Traceback when importing bible with disabled bible plugin in FTW"
  https://bugs.launchpad.net/openlp/+bug/1194622

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-1194622-2.0/+merge/181133

Fixed up the same problem with the songs.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-1194622-2.0/+merge/181133
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-1194622-2.0 into lp:openlp/2.0.

=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py	2013-08-19 21:09:52 +0000
+++ openlp/core/ui/firsttimeform.py	2013-08-20 19:08:23 +0000
@@ -186,11 +186,19 @@
         Determine the next page in the Wizard to go to.
         """
         Receiver.send_message(u'openlp_process_events')
+        # If we are currently on the plugins page
         if self.currentId() == FirstTimePage.Plugins:
+            # But we don't have Internet access
             if not self.webAccess:
                 return FirstTimePage.NoInternet
-            else:
+            # The songs plugin is enabled
+            elif self.songsCheckBox.isChecked():
                 return FirstTimePage.Songs
+            # The Bibles plugin is enabled
+            elif self.bibleCheckBox.isChecked():
+                return FirstTimePage.Bibles
+            else:
+                return FirstTimePage.Themes
         elif self.currentId() == FirstTimePage.Progress:
             return -1
         elif self.currentId() == FirstTimePage.NoInternet: