From c15fb864ec06f535993526a8d3c4b93d8d9fa376 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Thu, 15 Jul 2010 01:06:20 +0100
Subject: [PATCH] Fix service save location (Bug #605649)

---
 openlp/core/ui/servicemanager.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index a69d02711..cf9afe066 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -575,16 +575,16 @@ class ServiceManager(QtGui.QWidget):
             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'