diff options
| -rw-r--r-- | libs/ardour/ardour/session.h | 6 | ||||
| -rw-r--r-- | libs/ardour/session_state.cc | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 807c2686eb..daaecd8a38 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -628,6 +628,10 @@ public: _session->_save_queued = false; _session->save_state (""); } + while (_session->_save_queued_pending) { + _session->_save_queued_pending = false; + _session->save_state ("", true); + } } } private: @@ -1413,6 +1417,8 @@ private: friend class StateProtector; gint _suspend_save; /* atomic */ volatile bool _save_queued; + volatile bool _save_queued_pending; + Glib::Threads::Mutex save_state_lock; Glib::Threads::Mutex save_source_lock; Glib::Threads::Mutex peak_cleanup_lock; diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index e7b1a29d3e..757344f69c 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -785,10 +785,20 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot } if (g_atomic_int_get(&_suspend_save)) { - _save_queued = true; + /* StateProtector cannot be used for templates or save-as */ + assert (!template_only && !switch_to_snapshot && !for_archive && snapshot_name.empty ()); + if (pending) { + _save_queued_pending = true; + } else { + _save_queued = true; + } return 1; } - _save_queued = false; + if (pending) { + _save_queued_pending = false; + } else { + _save_queued = false; + } snapshot_t fork_state = NormalSave; if (!snapshot_name.empty() && snapshot_name != _current_snapshot_name && !template_only && !pending && !for_archive) { |