openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #17919
[Merge] lp:~phill-ridout/openlp/1066142 into lp:openlp
phill has proposed merging lp:~phill-ridout/openlp/1066142 into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1066142 in OpenLP: "cancel firsttime wizard without song causes song reindexing"
https://bugs.launchpad.net/openlp/+bug/1066142
For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/1066142/+merge/132823
fixes bug #1066142 "cancel firsttime wizard without song causes song reindexing"
--
https://code.launchpad.net/~phill-ridout/openlp/1066142/+merge/132823
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/1066142 into lp:openlp.
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2012-10-21 14:07:57 +0000
+++ openlp/core/ui/mainwindow.py 2012-11-04 20:50:25 +0000
@@ -817,7 +817,10 @@
return
Receiver.send_message(u'cursor_busy')
screens = ScreenList()
- FirstTimeForm(screens, self).exec_()
+ firstTime = FirstTimeForm(screens, self)
+ firstTime.exec_()
+ if firstTime.downloadCancelled:
+ return
self.firstTime()
for plugin in self.pluginManager.plugins:
self.activePlugin = plugin
Follow ups