Use sys::remove instead of ::unlink in Session::remove_pending_capture_state for...
authorTim Mayberry <mojofunk@gmail.com>
Tue, 4 Sep 2007 04:48:06 +0000 (04:48 +0000)
committerTim Mayberry <mojofunk@gmail.com>
Tue, 4 Sep 2007 04:48:06 +0000 (04:48 +0000)
git-svn-id: svn://localhost/ardour2/trunk@2373 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/session_state.cc

index bdaaa9e15304ef970ec4b5232066aec29b0ee47d..c043b3b1ba8cfb7b61836cf491a0b2101c68e26d 100644 (file)
@@ -494,11 +494,19 @@ Session::maybe_write_autosave()
 void
 Session::remove_pending_capture_state ()
 {
-       sys::path xml_path(_session_dir->root_path());
+       sys::path pending_state_file_path(_session_dir->root_path());
 
-       xml_path /= _current_snapshot_name + pending_suffix;
+       pending_state_file_path /= _current_snapshot_name + pending_suffix;
 
-       unlink (xml_path.to_string().c_str());
+       try
+       {
+               sys::remove (pending_state_file_path);
+       }
+       catch(sys::filesystem_error& ex)
+       {
+               error << string_compose(_("Could remove pending capture state at path \"%1\" (%2)"),
+                               pending_state_file_path.to_string(), ex.what()) << endmsg;
+       }
 }
 
 /** Rename a state file.