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)


Fix service save location
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/29941
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2010-07-14 22:16:59 +0000
+++ openlp/core/ui/servicemanager.py	2010-07-15 00:09:48 +0000
@@ -575,16 +575,16 @@
             SettingsManager.get_last_dir(self.parent.serviceSettingsSection),
             translate('ServiceManager', 'OpenLP Service Files (*.osz)'))
         else:
-            filename = SettingsManager.get_last_dir(
-                self.parent.serviceSettingsSection)
+            filename = os.path.join(SettingsManager.get_last_dir(
+                self.parent.serviceSettingsSection), self.serviceName)
         if filename:
+            filename = QtCore.QDir.toNativeSeparators(filename)
             splittedFile = filename.split(u'.')
             if splittedFile[-1] != u'osz':
                 filename = filename + u'.osz'
             filename = unicode(filename)
             self.isNew = False
-            SettingsManager.set_last_dir(
-                self.parent.serviceSettingsSection,
+            SettingsManager.set_last_dir(self.parent.serviceSettingsSection,
                 os.path.split(filename)[0])
             service = []
             servicefile = filename + u'.osd'