From 3fa5422d7d0bea607846ccdb0c95a664213ec27b Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Thu, 17 May 2012 21:49:06 +0200
Subject: [PATCH] fixed recent file menu

---
 openlp/core/ui/mainwindow.py     | 15 +++++++--------
 openlp/core/ui/servicemanager.py |  7 +++----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index a8ddb9235..f9303801a 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -1334,8 +1334,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         log.debug(u'Saving QSettings')
         settings = Settings()
         settings.beginGroup(self.generalSettingsSection)
-        recentFiles = self.recentFiles if self.recentFiles else u''
-        settings.setValue(u'recent files', recentFiles)
+        settings.setValue(
+            u'recent files', self.recentFiles if self.recentFiles else list())
         settings.endGroup()
         settings.beginGroup(self.uiSettingsSection)
         settings.setValue(u'main window position', self.pos())
@@ -1359,6 +1359,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             if os.path.isfile(unicode(recentFile))]
         recentFilesToDisplay = existingRecentFiles[0:recentFileCount]
         self.clearRecentFileMenu()
+        self.recentFilesMenu.clear()
         for fileId, filename in enumerate(recentFilesToDisplay):
             log.debug('Recent file name: %s', filename)
             action = create_action(self, u'',
@@ -1394,13 +1395,11 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             # in the given filename which then causes duplication.
             if filename[1:3] == ':\\':
                 filename = filename[0].upper() + filename[1:]
-            position = self.recentFiles.indexOf(filename)
-            if position != -1:
-                self.recentFiles.removeAt(position)
+            if filename in self.recentFiles:
+                self.recentFiles.remove(filename)
             self.recentFiles.insert(0, filename)
-            while self.recentFiles.count() > maxRecentFiles:
-                # Don't care what API says takeLast works, removeLast doesn't!
-                self.recentFiles.takeLast()
+            while len(self.recentFiles) > maxRecentFiles:
+                self.recentFiles.pop()
 
     def clearRecentFileMenu(self):
         """
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 78ca788de..6cffc3d6e 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -593,15 +593,14 @@ class ServiceManager(QtGui.QWidget):
         default_service_enabled = Settings().value(
             u'advanced/default service enabled', True)
         if default_service_enabled:
-            service_day = Settings().value(
-                u'advanced/default service day', 7).toInt()[0]
+            service_day = Settings().value(u'advanced/default service day', 7)
             if service_day == 7:
                 time = datetime.now()
             else:
                 service_hour = Settings().value(
-                    u'advanced/default service hour', 11).toInt()[0]
+                    u'advanced/default service hour', 11)
                 service_minute = Settings().value(
-                    u'advanced/default service minute', 0).toInt()[0]
+                    u'advanced/default service minute', 0)
                 now = datetime.now()
                 day_delta = service_day - now.weekday()
                 if day_delta < 0: