diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mixer.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/option_editor.cc | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 44cc270c4a..de4eaca43e 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1619,7 +1619,10 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path) if (response == Gtk::RESPONSE_CANCEL || response == Gtk::RESPONSE_DELETE_EVENT) { - quit(); + if (!session) { + quit(); + } + new_session_dialog->hide (); return; } else if (response == Gtk::RESPONSE_NONE) { diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 38899a7e3a..52f48b8174 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -49,7 +49,7 @@ Editor::cms_deleted () void Editor::show_editor_mixer (bool yn) { - show_editor_mixer_when_tracks_arrive = true; + show_editor_mixer_when_tracks_arrive = false; if (yn) { diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index b75ef7ead8..0f1be3dd21 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -322,7 +322,7 @@ OptionEditor::destructo_xfade_adjustment_changed () Config->set_destructive_xfade_msecs ((uint32_t) floor (val)); if (session) { - DestructiveFileSource::setup_standard_crossfades (session->frame_rate()); + SndFileSource::setup_standard_crossfades (session->frame_rate()); } } |