raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix mismerge

Browse Source
This commit is contained in:
Jon Tibble 2010-07-10 11:44:23 +01:00
parent f3a56ecee6
commit 4eb067343c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/ui/mainwindow.py
View File

@ -974,6 +974,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
if position != -1: if position != -1:
self.recentFiles.removeAt(position) self.recentFiles.removeAt(position)
self.recentFiles.insert(0, QtCore.QString(filename)) 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! # Don't care what API says takeLast works, removeLast doesn't!
self.recentFiles.takeLast() self.recentFiles.takeLast()