diff options
| -rw-r--r-- | gtk2_ardour/export_dialog.cc | 15 | ||||
| -rw-r--r-- | gtk2_ardour/export_dialog.h | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index a64acd1680..1458747786 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -215,9 +215,9 @@ ExportDialog::init_components () } void -ExportDialog::notify_errors () +ExportDialog::notify_errors (bool force) { - if (status->errors()) { + if (force || status->errors()) { std::string txt = _("Export has been aborted due to an error!\nSee the Log for details."); Gtk::MessageDialog msg (txt, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); msg.run(); @@ -303,9 +303,14 @@ ExportDialog::show_conflicting_files () void ExportDialog::do_export () { - profile_manager->prepare_for_export (); - handler->do_export (); - show_progress (); + try { + profile_manager->prepare_for_export (); + handler->do_export (); + show_progress (); + } catch(std::exception & e) { + error << string_compose (_("Export initialization failed: %1"), e.what()) << endmsg; + notify_errors(true); + } } void diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h index 52c53660d8..756a3e7b53 100644 --- a/gtk2_ardour/export_dialog.h +++ b/gtk2_ardour/export_dialog.h @@ -95,7 +95,7 @@ class ExportDialog : public ArdourDialog { void expanded_changed(); - void notify_errors (); + void notify_errors (bool force = false); void close_dialog (); void sync_with_manager (); |