diff options
Diffstat (limited to 'gtk2_ardour/export_dialog.cc')
-rw-r--r-- | gtk2_ardour/export_dialog.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 9d707678cf..5e6812429a 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -21,6 +21,8 @@ #include <sigc++/signal.h> +#include <gtkmm/messagedialog.h> + #include "ardour/audioregion.h" #include "ardour/export_status.h" #include "ardour/export_handler.h" @@ -94,8 +96,6 @@ ExportDialog::set_session (ARDOUR::Session* s) channel_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings_and_example_filename)); file_notebook->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings_and_example_filename)); - status->Aborting.connect (abort_connection, invalidator (*this), boost::bind (&ExportDialog::notify_errors, this), gui_context()); - update_warnings_and_example_filename (); } @@ -323,6 +323,7 @@ ExportDialog::show_progress () progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ExportDialog::progress_timeout), 100); gtk_main_iteration (); + while (status->running) { if (gtk_events_pending()) { gtk_main_iteration (); @@ -339,9 +340,11 @@ ExportDialog::show_progress () ns->nag (); delete ns; } - - status->finish (); + } else { + notify_errors (); } + + status->finish (); } gint |