diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-02 18:09:34 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-02 18:09:34 +0000 |
| commit | 02115563feabd8d0019bfda605c88552c24f0890 (patch) | |
| tree | bd056b5118f4313364e64062ecbfa5a05f484d2f /gtk2_ardour/ardour_ui.cc | |
| parent | 0b6139304ba628d63bfcad3a868fd5757bb6478c (diff) | |
fixes for various bugs including dangling ref to route in session, opening sessions from the NSD, closing a session leaving dangling pointers etc etc
git-svn-id: svn://localhost/ardour2/trunk@938 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 701c69c996..97d5c81b28 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1629,6 +1629,7 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path) do { response = new_session_dialog->run (); //nsd_window ->set_cursor(Gdk::Cursor(Gdk::WATCH)); + if(response == Gtk::RESPONSE_CANCEL || response == Gtk::RESPONSE_DELETE_EVENT) { quit(); return; @@ -1645,7 +1646,6 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path) if (session_name.empty()) { response = Gtk::RESPONSE_NONE; - cerr << "session name is empty\n"; continue; } @@ -1660,6 +1660,8 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path) } else if (response == Gtk::RESPONSE_OK) { + session_name = new_session_dialog->session_name(); + if (new_session_dialog->get_current_page() == 1) { /* XXX this is a bit of a hack.. @@ -1670,7 +1672,6 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path) if (session_name.empty()) { response = Gtk::RESPONSE_NONE; - cerr << "session name is empty 2\n"; continue; } @@ -1687,11 +1688,8 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path) _session_is_new = true; - session_name = new_session_dialog->session_name(); - if (session_name.empty()) { response = Gtk::RESPONSE_NONE; - cerr << "session name is empty 3\n"; continue; } |