summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui_dependents.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-10-11 22:07:47 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-10-11 22:07:47 +0000
commitf7f9d6fdc40248b190ec9c6e1a886261d55777ae (patch)
tree080723e9dc35a66013b37acbafc67a6afa929302 /gtk2_ardour/ardour_ui_dependents.cc
parentaa1f736a651376534acaa2268b65d42a3786fff7 (diff)
merge from 2.0-ongoing by hand, minus key binding editor
git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_dependents.cc')
-rw-r--r--gtk2_ardour/ardour_ui_dependents.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 725180e0ab..6464c52967 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -47,7 +47,8 @@ void
ARDOUR_UI::shutdown ()
{
if (session) {
- delete session;
+ /* we're exiting cleanly, so remove any auto-save data */
+ session->remove_pending_capture_state ();
session = 0;
}
@@ -109,11 +110,13 @@ void
ARDOUR_UI::goto_editor_window ()
{
editor->show_window ();
+ editor->present ();
}
void
ARDOUR_UI::goto_mixer_window ()
{
mixer->show_window ();
+ mixer->present ();
}
gint