openlp-core team mailing list archive

[Armin Köhler <orangeshirt@xxxxxx>]

Armin Köhler has proposed merging lp:~orangeshirt/openlp/foilpresenterimport into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #779995 in OpenLP: "FoilPresenter songs with verses without text cause a traceback"
  https://bugs.launchpad.net/openlp/+bug/779995

For more details, see:
https://code.launchpad.net/~orangeshirt/openlp/foilpresenterimport/+merge/61467

fix bug https://bugs.launchpad.net/openlp/+bug/779995
-- 
https://code.launchpad.net/~orangeshirt/openlp/foilpresenterimport/+merge/61467
Your team OpenLP Core is requested to review the proposed merge of lp:~orangeshirt/openlp/foilpresenterimport into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/foilpresenterimport.py'
--- openlp/plugins/songs/lib/foilpresenterimport.py	2011-05-10 14:08:11 +0000
+++ openlp/plugins/songs/lib/foilpresenterimport.py	2011-05-18 19:47:47 +0000
@@ -422,7 +422,8 @@
             VerseType.Tags[VerseType.PreChorus]: 1
         }
         for strophe in foilpresenterfolie.strophen.strophe:
-            text = self._child(strophe.text_)
+            text = self._child(strophe.text_) if hasattr(strophe, u'text_') \
+                else u''
             verse_name = self._child(strophe.key)
             children = strophe.getchildren()
             sortnr = False