ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix assert() when removing track(s) 

ARDOUR::Session::remove_routes() explicitly calls
save_state (_current_snapshot_name)

Update assert() to treat an empty name
equivalently as explicitly specified _current_snapshot_name
This commit is contained in:
Robin Gareus 2020-01-30 21:05:48 +01:00
parent d4f816c158
commit d887f5965a
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/session_state.cc
View File

@ -765,9 +765,9 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
/* template and archive are exclusive */
assert (!template_only || !for_archive);
/* switch_to_snapshot needs a new name and can't be pending */
assert (!switch_to_snapshot || (!snapshot_name.empty () && !pending && !template_only && !for_archive));
assert (!switch_to_snapshot || (!snapshot_name.empty () && snapshot_name != _current_snapshot_name && !pending && !template_only && !for_archive));
/* pending saves are for current snapshot only */
assert (!pending || (snapshot_name.empty () && !template_only && !for_archive));
assert (!pending || ((snapshot_name.empty () || snapshot_name == _current_snapshot_name) && !template_only && !for_archive));
XMLTree tree;
std::string xml_path(_session_dir->root_path());
@ -786,7 +786,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
if (g_atomic_int_get(&_suspend_save)) {
/* StateProtector cannot be used for templates or save-as */
assert (!template_only && !switch_to_snapshot && !for_archive && snapshot_name.empty ());
assert (!template_only && !switch_to_snapshot && !for_archive && (snapshot_name.empty () || snapshot_name == _current_snapshot_name));
if (pending) {
_save_queued_pending = true;
} else {