From 4847efdfd6e1634e3ca70e02199b6c782e8cdc31 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 21 Feb 2015 22:05:25 +0200 Subject: [PATCH] Release 2.1.3 bzr-revno: 2513 --- openlp/.version | 2 +- openlp/core/ui/mainwindow.py | 2 ++ tests/utils/test_bzr_tags.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/openlp/.version b/openlp/.version index eca07e4c1..ac2cdeba0 100644 --- a/openlp/.version +++ b/openlp/.version @@ -1 +1 @@ -2.1.2 +2.1.3 diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 0e919871a..34cbad495 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -1317,6 +1317,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow, RegistryProperties): filename = filename[0].upper() + filename[1:] if filename in self.recent_files: self.recent_files.remove(filename) + if not isinstance(self.recent_files, list): + self.recent_files = [self.recent_files] self.recent_files.insert(0, filename) while len(self.recent_files) > max_recent_files: self.recent_files.pop() diff --git a/tests/utils/test_bzr_tags.py b/tests/utils/test_bzr_tags.py index 737f2f531..76afb5c11 100644 --- a/tests/utils/test_bzr_tags.py +++ b/tests/utils/test_bzr_tags.py @@ -45,7 +45,8 @@ TAGS = [ ['2.0', '2118'], ['2.1.0', '2119'], ['2.1.1', '2438'], - ['2.1.2', '2488'] + ['2.1.2', '2488'], + ['2.1.3', '2513'] ] # Depending on the repository, we sometimes have the 2.0.x tags in the repo too. They come up with a revision number of # "?", which I suspect is due to the fact that we're using shared repositories. This regular expression matches all