raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash when importing EW DB with unexpected data formatting.

Browse Source 
bzr-revno: 2194
This commit is contained in:
Tomas Groth 2014-06-08 08:59:24 +01:00 committed by Tim Bentley
commit 31d7ec80ae
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/plugins/songs/lib/ewimport.py
View File

@ -188,7 +188,14 @@ class EasyWorshipSongImport(SongImport):
self.addAuthor(author_name.strip()) self.addAuthor(author_name.strip())
if words: if words:
# Format the lyrics # Format the lyrics
result = None
try:
result = strip_rtf(words, self.encoding) 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: if result is None:
return return
words, self.encoding = result words, self.encoding = result