ardour/livetrax
13
0
Fork 0
Code

disconnect from audio/MIDI setup dialog signal response when done with it

Browse Source
This commit is contained in:
Paul Davis 2020-01-25 10:27:12 -07:00
parent 8ecfee2c94
commit cbfbe65128
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/ardour_ui_session.cc
View File

@ -352,7 +352,6 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
if (!AudioEngine::instance()->running()) { if (!AudioEngine::instance()->running()) {
audio_midi_setup->set_position (WIN_POS_CENTER); audio_midi_setup->set_position (WIN_POS_CENTER);
audio_midi_setup->present (); audio_midi_setup->present ();
_engine_dialog_connection.disconnect ();
_engine_dialog_connection = audio_midi_setup->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::audio_midi_setup_reconfigure_done), path, snap_name, mix_template)); _engine_dialog_connection = audio_midi_setup->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::audio_midi_setup_reconfigure_done), path, snap_name, mix_template));
/* not done yet, but we're avoiding modal dialogs */ /* not done yet, but we're avoiding modal dialogs */
return 0; return 0;
@ -365,6 +364,8 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
void void
ARDOUR_UI::audio_midi_setup_reconfigure_done (int response, std::string path, std::string snap_name, std::string mix_template) ARDOUR_UI::audio_midi_setup_reconfigure_done (int response, std::string path, std::string snap_name, std::string mix_template)
{ {
_engine_dialog_connection.disconnect ();
switch (response) { switch (response) {
case Gtk::RESPONSE_DELETE_EVENT: case Gtk::RESPONSE_DELETE_EVENT:
break; break;
@ -562,7 +563,6 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
audio_midi_setup->set_position (WIN_POS_CENTER); audio_midi_setup->set_position (WIN_POS_CENTER);
audio_midi_setup->set_modal (); audio_midi_setup->set_modal ();
audio_midi_setup->present (); audio_midi_setup->present ();
_engine_dialog_connection.disconnect ();
_engine_dialog_connection = audio_midi_setup->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::audio_midi_setup_for_new_session_done), path, snap_name, session_template, bus_profile)); _engine_dialog_connection = audio_midi_setup->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::audio_midi_setup_for_new_session_done), path, snap_name, session_template, bus_profile));
/* not done yet, but we're avoiding modal dialogs */ /* not done yet, but we're avoiding modal dialogs */
@ -573,6 +573,8 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
void void
ARDOUR_UI::audio_midi_setup_for_new_session_done (int response, std::string path, std::string snap_name, std::string template_name, BusProfile const& bus_profile) ARDOUR_UI::audio_midi_setup_for_new_session_done (int response, std::string path, std::string snap_name, std::string template_name, BusProfile const& bus_profile)
{ {
_engine_dialog_connection.disconnect ();
switch (response) { switch (response) {
case Gtk::RESPONSE_DELETE_EVENT: case Gtk::RESPONSE_DELETE_EVENT:
audio_midi_setup->set_modal (false); audio_midi_setup->set_modal (false);