From 4eb067343c03954c2b4a9c62519820b0b7838e35 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Sat, 10 Jul 2010 11:44:23 +0100 Subject: [PATCH] Fix mismerge --- openlp/core/ui/mainwindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 6c58e5e64..ccef8a5ea 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -974,6 +974,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): if position != -1: self.recentFiles.removeAt(position) self.recentFiles.insert(0, QtCore.QString(filename)) - while self.recentFiles.count() > recentFileCount: + while self.recentFiles.count() > maxRecentFiles: # Don't care what API says takeLast works, removeLast doesn't! self.recentFiles.takeLast()