diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-03 02:25:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-03 02:25:04 +0000 |
| commit | c6468d181f28654b90a9e5686a662f6696c130f5 (patch) | |
| tree | 3bb90b28274255d34fd49af5566915fee54a06bf | |
| parent | 1b2ecaee84bedd9fc76573ad63a21b845aec8893 (diff) | |
do not allow NSD to quit ardour if the user presses "Quit" with a session already loaded
git-svn-id: svn://localhost/ardour2/trunk@1064 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -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()); } } |