From 4de4c2aab4c8c6116246cd7b885e9de4ad3ab19c Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 23 Jun 2012 05:08:33 +0000 Subject: [PATCH] Use g_remove instead of sys::remove in Session::save_state git-svn-id: svn://localhost/ardour2/branches/3.0@12871 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_state.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 29211a7cdb..56d9bcc004 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -813,7 +813,10 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot if (!tree.write (tmp_path.to_string())) { error << string_compose (_("state could not be saved to %1"), tmp_path.to_string()) << endmsg; - sys::remove (tmp_path); + if (g_remove (tmp_path.to_string().c_str()) != 0) { + error << string_compose(_("Could not remove temporary state file at path \"%1\" (%2)"), + tmp_path.to_string(), g_strerror (errno)) << endmsg; + } return -1; } else { @@ -821,7 +824,10 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot if (::rename (tmp_path.to_string().c_str(), xml_path.c_str()) != 0) { error << string_compose (_("could not rename temporary session file %1 to %2"), tmp_path.to_string(), xml_path) << endmsg; - sys::remove (tmp_path); + if (g_remove (tmp_path.to_string().c_str()) != 0) { + error << string_compose(_("Could not remove temporary state file at path \"%1\" (%2)"), + tmp_path.to_string(), g_strerror (errno)) << endmsg; + } return -1; } }