openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/reindex into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Prevent a bug.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/reindex/+merge/40986
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/reindex into lp:openlp.

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2010-11-16 09:29:46 +0000
+++ openlp/plugins/songs/songsplugin.py	2010-11-16 17:30:27 +0000
@@ -145,6 +145,10 @@
         counter = 0
         for song in songs:
             counter += 1
+            if song.title is None:
+                song.title = u''
+            if song.alternate_title is None:
+                song.alternate_title = u''
             song.search_title = self.whitespace.sub(u' ', song.title.lower()) +\
                 u' ' + self.whitespace.sub(u' ', song.alternate_title.lower())
             progressDialog.setValue(counter)