openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #892668 in OpenLP: "Duplicate entries in Recent Files list (win7)"
  https://bugs.launchpad.net/openlp/+bug/892668

For more details, see:
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/84691

Fix the non-ascii check on Macs
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/84691
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2011-12-04 20:57:58 +0000
+++ openlp/core/ui/mainwindow.py	2011-12-06 22:41:39 +0000
@@ -720,8 +720,10 @@
             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():