smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 17:03:06 +01:00
Code Issues Projects Releases Wiki Activity

Further tweaks to .pending file removal

Browse source 
* only delete it after successful save
* show unlink notification in debug-builds
This commit is contained in:
Robin Gareus 2019-08-16 05:31:50 +02:00
parent 994b59c836
commit ae2b6e6b09
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libs/ardour/session_state.cc
View file

@ -722,12 +722,19 @@ Session::remove_pending_capture_state ()
pending_state_file_path = Glib::build_filename (pending_state_file_path, legalize_for_path (_current_snapshot_name) + pending_suffix);
if (!Glib::file_test (pending_state_file_path, Glib::FILE_TEST_EXISTS)) return;
if (!Glib::file_test (pending_state_file_path, Glib::FILE_TEST_EXISTS)) {
return;
}
if (g_remove (pending_state_file_path.c_str()) != 0) {
if (::g_unlink (pending_state_file_path.c_str()) != 0) {
error << string_compose(_("Could not remove pending capture state at path \"%1\" (%2)"),
pending_state_file_path, g_strerror (errno)) << endmsg;
}
#ifndef NDEBUG
else {
cerr << "removed " << pending_state_file_path << endl;
}
#endif
}
/** Rename a state file.
@ -817,10 +824,6 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
fork_state = switch_to_snapshot ? SwitchToSnapshot : SnapshotKeep;
}
if (!pending && !for_archive && ! template_only) {
remove_pending_capture_state ();
}
#ifndef NDEBUG
const int64_t save_start_time = g_get_monotonic_time();
#endif
@ -873,7 +876,7 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
}
} else {
assert (snapshot_name == _current_snapshot_name);
/* pending save: use pending_suffix (.pending in English) */
xml_path = Glib::build_filename (xml_path, legalize_for_path (snapshot_name) + pending_suffix);
}
@ -951,6 +954,11 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
const int64_t elapsed_time_us = g_get_monotonic_time() - save_start_time;
cerr << "saved state in " << fixed << setprecision (1) << elapsed_time_us / 1000. << " ms\n";
#endif
if (!pending && !for_archive && ! template_only) {
remove_pending_capture_state ();
}
return 0;
}