13
0

Revert "Fix saving sessions on windows by using g_rename instead of ::rename"

This reverts commit 2e2c22ad3c.
This commit is contained in:
Paul Davis 2013-07-13 17:10:11 -04:00
parent 2e2c22ad3c
commit 868b06efd6

View File

@ -807,9 +807,9 @@ Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot
} else {
if (g_rename (tmp_path.c_str(), xml_path.c_str()) != 0) {
error << string_compose (_("could not rename temporary session file %1 to %2 (%3)"),
tmp_path, xml_path, g_strerror(errno)) << endmsg;
if (::rename (tmp_path.c_str(), xml_path.c_str()) != 0) {
error << string_compose (_("could not rename temporary session file %1 to %2"),
tmp_path, xml_path) << endmsg;
if (g_remove (tmp_path.c_str()) != 0) {
error << string_compose(_("Could not remove temporary session file at path \"%1\" (%2)"),
tmp_path, g_strerror (errno)) << endmsg;