summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-07-13 17:10:11 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-07-13 17:10:11 -0400
commit868b06efd65d59af023e37ab63d283c522feb121 (patch)
treeac8e7369f88a5f28963761065bb124b0018d634e
parent2e2c22ad3c0af34b311024b1f8cb4571c1e3c48f (diff)
Revert "Fix saving sessions on windows by using g_rename instead of ::rename"
This reverts commit 2e2c22ad3c0af34b311024b1f8cb4571c1e3c48f.
-rw-r--r--libs/ardour/session_state.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index b66969176c..7ccaca1a27 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -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;