diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-29 18:52:55 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-29 18:52:55 +0000 |
commit | 2f53112e83ff46ed535696a940e0bd5258a4fe66 (patch) | |
tree | c37acf6647e68faf3df25b463f7429c4c00b1e9c /libs/ardour/session_state.cc | |
parent | e27ac3278b0d335be0ccd9d6d6373287d406adb5 (diff) |
a) fix special button press handling for solo+mute buttons
b) buttons for "restore pending state" dialog had reversed semantics
c) logic for checking a pending source file header was wrong
d) fixed file unlink from within real-time context
git-svn-id: svn://localhost/trunk/ardour2@424 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_state.cc')
-rw-r--r-- | libs/ardour/session_state.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 6a42c0e4d1..58f1d7c0a0 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -765,8 +765,11 @@ Session::load_state (string snapshot_name) /* there is pending state from a crashed capture attempt */ if (AskAboutPendingState()) { + cerr << "use pending state\n"; state_was_pending = true; - } + } else { + cerr << "do not use pending state\n"; + } } if (!state_was_pending) { @@ -1270,7 +1273,7 @@ Session::get_template() sources in their state node. */ - disable_record (); + disable_record (false); return state(false); } |