Fix crash when importing EW DB with unexpected data formatting.

bzr-revno: 2194
2014-06-08 08:59:24 +01:00 · 2014-06-08 08:59:24 +01:00 · 31d7ec80ae
parent 725be17e7e bc1675419d
commit 31d7ec80ae
1 changed files with 8 additions and 1 deletions
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@ -188,7 +188,14 @@ class EasyWorshipSongImport(SongImport):
                        self.addAuthor(author_name.strip())
                if words:
                    # Format the lyrics
-                    result = strip_rtf(words, self.encoding)
+                    result = None
+                    try:
+                        result = strip_rtf(words, self.encoding)
+                    except UnicodeDecodeError:
+                        # The unicode chars in the rtf was not escaped in the expected manner.
+                        self.logError(self.title, unicode(translate('SongsPlugin.EasyWorshipSongImport',
+                                                                    'Unexpected data formatting.')))
+                        continue
                    if result is None:
                        return
                    words, self.encoding = result