openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-1015528 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1015528 in OpenLP: "If cancel song import, song list is not refreshed"
  https://bugs.launchpad.net/openlp/+bug/1015528

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-1015528/+merge/112005

Reload list even if import cancelled
-- 
https://code.launchpad.net/~trb143/openlp/bug-1015528/+merge/112005
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-1015528 into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2012-06-22 14:14:53 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2012-06-26 05:41:23 +0000
@@ -338,8 +338,9 @@
     def onImportClick(self):
         if not hasattr(self, u'importWizard'):
             self.importWizard = SongImportForm(self, self.plugin)
-        if self.importWizard.exec_() == QtGui.QDialog.Accepted:
-            Receiver.send_message(u'songs_load_list')
+        self.importWizard.exec_()
+        # Run song load as list may have been cancelled but some songs loaded
+        Receiver.send_message(u'songs_load_list')
 
     def onExportClick(self):
         if not hasattr(self, u'exportWizard'):