Fix the non-ascii check on Macs

bzr-revno: 1825
2011-12-07 22:23:12 +00:00 · 2011-12-07 22:23:12 +00:00 · e778531fb1
parent 73d0050b95 fd8525bf89
commit e778531fb1
1 changed files with 4 additions and 2 deletions
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@ -720,8 +720,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
            args = []
            for a in self.arguments:
                args.extend([a])
-            self.serviceManagerContents.loadFile(unicode(args[0],
-                sys.getfilesystemencoding()))
+            filename = args[0]
+            if not isinstance(filename, unicode):
+                filename = unicode(filename, sys.getfilesystemencoding())
+            self.serviceManagerContents.loadFile(filename)
        elif QtCore.QSettings().value(
            self.generalSettingsSection + u'/auto open',
            QtCore.QVariant(False)).toBool():