From d4f2f9a57eafdc6e11afaa71d28d6d2b8754c1d5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 3 Jan 2011 15:17:18 +0000 Subject: [PATCH] fix or band-aid for #3649 (loading a session file might fail when using the session importer) git-svn-id: svn://localhost/ardour2/branches/3.0@8414 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/session_import_dialog.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc index 6fdac9aa90..b5bdcc3cd6 100644 --- a/gtk2_ardour/session_import_dialog.cc +++ b/gtk2_ardour/session_import_dialog.cc @@ -104,7 +104,10 @@ void SessionImportDialog::load_session (const string& filename) { if (_session) { - tree.read (filename); + if (tree.read (filename)) { + error << string_compose (_("Cannot load XML for session from %1", filename)) << endmsg; + return; + } boost::shared_ptr region_handler (new AudioRegionImportHandler (tree, *_session)); boost::shared_ptr pl_handler (new AudioPlaylistImportHandler (tree, *_session, *region_handler));