diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-21 18:23:07 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-21 18:23:07 +0000 |
| commit | f450df300c9c057141a4caf79ff6dbfbf58492d9 (patch) | |
| tree | 409f9c56056a337cade83d45ccff47ccdb06dd0c /gtk2_ardour/session_import_dialog.cc | |
| parent | 738387f9a417537e768d56d3fc4afcb9dc82d66b (diff) | |
fully implement and deploy explicit x-thread signal connection syntax (testing comes next)
git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/session_import_dialog.cc')
| -rw-r--r-- | gtk2_ardour/session_import_dialog.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc index 5b6b8a71b4..675a3b0603 100644 --- a/gtk2_ardour/session_import_dialog.cc +++ b/gtk2_ardour/session_import_dialog.cc @@ -30,6 +30,7 @@ #include <gtkmm2ext/utils.h> +#include "gui_thread.h" #include "prompter.h" #include "i18n.h" @@ -91,10 +92,10 @@ SessionImportDialog::SessionImportDialog (ARDOUR::Session* target) : ok_button = add_button (_("Import"), Gtk::RESPONSE_ACCEPT); ok_button->signal_clicked().connect (sigc::mem_fun (*this, &SessionImportDialog::do_merge)); - // prompt signals - ElementImporter::Rename.connect (connections, boost::bind (&SessionImportDialog::open_rename_dialog, this, _1, _2)); - ElementImporter::Prompt.connect (connections, boost::bind (&SessionImportDialog::open_prompt_dialog, this, _1)); - + // prompt signals XXX: problem - handlers to be in the same thread since they return values + ElementImporter::Rename.connect_same_thread (connections, boost::bind (&SessionImportDialog::open_rename_dialog, this, _1, _2)); + ElementImporter::Prompt.connect_same_thread (connections, boost::bind (&SessionImportDialog::open_prompt_dialog, this, _1)); + // Finalize show_all(); } |