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/84409

Fix unicode filenames when loading services at OpenLP launch.
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/84409
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 14:42:39 +0000
+++ openlp/core/ui/mainwindow.py	2011-12-04 21:10:30 +0000
@@ -720,7 +720,8 @@
             args = []
             for a in self.arguments:
                 args.extend([a])
-            self.serviceManagerContents.loadFile(unicode(args[0]))
+            self.serviceManagerContents.loadFile(unicode(args[0],
+                sys.getfilesystemencoding()))
         elif QtCore.QSettings().value(
             self.generalSettingsSection + u'/auto open',
             QtCore.QVariant(False)).toBool():