mirror of https://gitlab.com/openlp/openlp.git
Merge branch 'songselect-import-encoding' into 'master'
Always open downloaded songs as utf-8 See merge request openlp/openlp!725
This commit is contained in:
commit
3c20d5f8d6
|
@ -125,7 +125,7 @@ class SongSelectForm(QtWidgets.QDialog, Ui_SongSelectDialog, RegistryProperties)
|
||||||
self.song_progress_bar.setValue(2)
|
self.song_progress_bar.setValue(2)
|
||||||
song_filename = self.current_download_item.downloadDirectory() + '/' \
|
song_filename = self.current_download_item.downloadDirectory() + '/' \
|
||||||
+ self.current_download_item.downloadFileName()
|
+ self.current_download_item.downloadFileName()
|
||||||
song_file = open(song_filename, 'rt')
|
song_file = open(song_filename, 'rt', encoding='utf-8')
|
||||||
song_content = song_file.read()
|
song_content = song_file.read()
|
||||||
song_file.seek(0)
|
song_file.seek(0)
|
||||||
if self.check_for_duplicate(song_content):
|
if self.check_for_duplicate(song_content):
|
||||||
|
|
Loading…
Reference in New Issue