From 5d8c1e42ba6dbd30a2978654dcba6da2c4d87c05 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 14 Mar 2010 00:35:17 +0200 Subject: [PATCH] Fixed up an error in the Bibles plugin where OpenSong imports would be programmatically canceled. --- openlp/plugins/bibles/lib/opensong.py | 2 +- resources/innosetup/OpenLP-2.0.iss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py index 6fa18cf6d..43b9e71a3 100644 --- a/openlp/plugins/bibles/lib/opensong.py +++ b/openlp/plugins/bibles/lib/opensong.py @@ -102,7 +102,7 @@ class OpenSongBible(BibleDB): finally: if file: file.close() - if self.stop_import: + if self.stop_import_flag: self.wizard.incrementProgressBar(u'Import canceled!') return False else: diff --git a/resources/innosetup/OpenLP-2.0.iss b/resources/innosetup/OpenLP-2.0.iss index 41e9cd84b..b826fa76f 100644 --- a/resources/innosetup/OpenLP-2.0.iss +++ b/resources/innosetup/OpenLP-2.0.iss @@ -22,7 +22,7 @@ DefaultDirName={pf}\{#MyAppName} DefaultGroupName=OpenLP 2.0 AllowNoIcons=true LicenseFile=LICENSE.txt -OutputBaseFilename=OpenLP-1.9.0-bzr737-setup +OutputBaseFilename=OpenLP-1.9.0-bzr739-setup Compression=lzma SolidCompression=true SetupIconFile=C:\Program Files\Inno Setup 5\Examples\Setup.ico