reinstate retrieve_windows_encoding dialog

2013-08-20 21:19:11 +00:00 · 2013-08-20 21:19:11 +00:00 · 7cc9f9ae7b
parent d724a6c872
commit 7cc9f9ae7b
1 changed files with 6 additions and 1 deletions
--- a/openlp/plugins/songs/lib/songshowplusimport.py
+++ b/openlp/plugins/songs/lib/songshowplusimport.py
@ -227,4 +227,9 @@ class SongShowPlusImport(SongImport):
        try:
            return unicode(data, chardet.detect(data)['encoding'])
        except:
-            return unicode(data, u'cp1252')
+            self.encoding = u'cp1252'
+            while self.encoding:
+                try:
+                    return unicode(data, self.encoding)
+                except:
+                    self.encoding = retrieve_windows_encoding()