← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~googol-hush/openlp/songs into lp:openlp

 

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/songs into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/songs/+merge/60141

Hello,

- fixed the songshowplus importer returning when it shouldn't (as pointed out by jerryb)
-- 
https://code.launchpad.net/~googol-hush/openlp/songs/+merge/60141
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/songs into lp:openlp.
=== modified file 'openlp/plugins/songs/lib/songshowplusimport.py'
--- openlp/plugins/songs/lib/songshowplusimport.py	2011-04-18 18:03:41 +0000
+++ openlp/plugins/songs/lib/songshowplusimport.py	2011-05-06 04:46:53 +0000
@@ -97,7 +97,7 @@
         """
         Receive a single file or a list of files to import.
         """
-        if isinstance(self.import_source, list):
+        if not isinstance(self.import_source, list):
             return
         self.import_wizard.progressBar.setMaximum(len(self.import_source))
         for file in self.import_source:


Follow ups