diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index e3b44237f..36fdf0181 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -741,13 +741,12 @@ class SongImportForm(OpenLPWizard): filenames=self.getListOfFiles(self.foilPresenterFileListWidget) ) test = importer.do_import() - importer.write_error_report() if isinstance(test, bool): raise received_boolean if importer.stop_import_flag: self.progressLabel.setText(translate('SongsPlugin.SongImportForm', 'Song import has been cancelled.')) - elif importer.import_error_log: + elif importer.error_log: error_path = importer.write_error_report() self.progressLabel.setTextInteractionFlags( QtCore.Qt.TextSelectableByMouse) diff --git a/openlp/plugins/songs/lib/foilpresenterimport.py b/openlp/plugins/songs/lib/foilpresenterimport.py index dcbc4367d..6f4164d17 100644 --- a/openlp/plugins/songs/lib/foilpresenterimport.py +++ b/openlp/plugins/songs/lib/foilpresenterimport.py @@ -237,6 +237,7 @@ class FoilPresenter(object): self._process_topics(foilpresenterfolie, song) clean_song(self.manager, song) self.manager.save_object(song) + return song.id def _child(self, element): """