Merge lp:~trb143/openlp/bug-884533 into lp:openlp

[Tim Bentley]

Fix case where two [---] lines are next to each other.

[Frank (frankopmeer)]

note: there was a second method. to get the same crash.
when you use [---] in a line. like:
songline one [---] this also gives a crash, end of songline one.

[Andreas Preikschat (googol-deactivatedaccount)]

@Tim:
I think we should also make sure that we do not save such wrong lyrics (Song Editor).

[Tim Bentley (trb143)]

That could be hard see the follow up comment on the bug.
This also fixes that!

[Raoul Snyman (raoul-snyman)]

review: Approve

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2011-10-16 14:40:46 +0000
+++ openlp/core/lib/renderer.py	2011-11-02 20:39:25 +0000
@@ -250,7 +250,12 @@
                         # render the first virtual slide.
                         text_contains_break = u'[---]' in text
                         if text_contains_break:
-                            text_to_render, text = text.split(u'\n[---]\n', 1)
+                            try:
+                                text_to_render, text = \
+                                    text.split(u'\n[---]\n', 1)
+                            except:
+                                text_to_render = text.split(u'\n[---]\n')[0]
+                                text = u''
                         else:
                             text_to_render = text
                             text = u''