openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-1016927 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1016927 in OpenLP: "Filesystem encoding problem when importing songs"
  https://bugs.launchpad.net/openlp/+bug/1016927

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-1016927/+merge/113762

- fixed bug 1016927 (Filesystem encoding problem when importing songs)

-- 
https://code.launchpad.net/~googol/openlp/bug-1016927/+merge/113762
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-1016927 into lp:openlp.

=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py	2012-07-04 09:50:31 +0000
+++ openlp/plugins/songs/forms/songimportform.py	2012-07-06 16:13:22 +0000
@@ -541,12 +541,13 @@
                 if wizard.formatWidgets[format][u'fileListWidget'].count() > 0:
                     return True
             else:
-                filepath = wizard.formatWidgets[format][u'filepathEdit'].text()
-                if not filepath.isEmpty():
-                    if select_mode == SongFormatSelect.SingleFile \
-                        and os.path.isfile(filepath):
+                filepath = unicode(
+                    wizard.formatWidgets[format][u'filepathEdit'].text())
+                if filepath:
+                    if select_mode == SongFormatSelect.SingleFile and \
+                        os.path.isfile(filepath):
                         return True
-                    elif select_mode == SongFormatSelect.SingleFolder \
-                        and os.path.isdir(filepath):
+                    elif select_mode == SongFormatSelect.SingleFolder and \
+                        os.path.isdir(filepath):
                         return True
         return False