From d45f93b5941f4bb4970d99d2ee1ef17a5263e9c4 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 19 Apr 2011 13:46:25 +0200 Subject: [PATCH] return where possible instead of breaking --- openlp/plugins/songs/lib/opensongimport.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py index fa20dfcac..54b96043d 100644 --- a/openlp/plugins/songs/lib/opensongimport.py +++ b/openlp/plugins/songs/lib/opensongimport.py @@ -128,14 +128,15 @@ class OpenSongImport(SongImport): self.import_wizard.progressBar.setMaximum(numfiles) for filename in self.import_source: if self.stop_import_flag: - break + return ext = os.path.splitext(filename)[1] if ext.lower() == u'.zip': log.debug(u'Zipfile found %s', filename) z = ZipFile(filename, u'r') for song in z.infolist(): if self.stop_import_flag: - break + z.close() + return parts = os.path.split(song.filename) if parts[-1] == u'': # No final part => directory