forward port 2.X changes up to and including rev 6909

[ardour.git] / libs / ardour / find_session.cc

diff --git a/libs/ardour/find_session.cc b/libs/ardour/find_session.cc
index 90a54b1390d3354d5156518611977ce7223a05f7..c635b86545ad442c457d76d6290f0c0e9fa76f91 100644 (file)
--- a/libs/ardour/find_session.cc
+++ b/libs/ardour/find_session.cc
@@ -5,6 +5,8 @@
 #include <climits>
 #include <cerrno>
 
+#include <glibmm/miscutils.h>
+
 #include "pbd/compose.h"
 #include "pbd/error.h"
 
@@ -53,17 +55,13 @@ ARDOUR::find_session (string str, string& path, string& snapshot, bool& isnew)
 
                if (S_ISDIR (statbuf.st_mode)) {
 
-                       string::size_type slash = str.find_last_of ('/');
+                       string::size_type slash = str.find_last_of (G_DIR_SEPARATOR);
 
                        if (slash == string::npos) {
 
                                /* a subdirectory of cwd, so statefile should be ... */
 
-                               string tmp;
-                               tmp = str;
-                               tmp += '/';
-                               tmp += str;
-                               tmp += statefile_suffix;
+                               string tmp = Glib::build_filename (str, str+statefile_suffix);
 
                                /* is it there ? */
 
@@ -90,7 +88,7 @@ ARDOUR::find_session (string str, string& path, string& snapshot, bool& isnew)
 
                } else if (S_ISREG (statbuf.st_mode)) {
 
-                       string::size_type slash = str.find_last_of ('/');
+                       string::size_type slash = str.find_last_of (G_DIR_SEPARATOR);
                        string::size_type suffix;
 
                        /* remove the suffix */
@@ -148,7 +146,7 @@ ARDOUR::find_session (string str, string& path, string& snapshot, bool& isnew)
                   as "dirname" does.
                */
 
-               string::size_type slash = str.find_last_of ('/');
+               string::size_type slash = str.find_last_of (G_DIR_SEPARATOR);
 
                if (slash == string::npos) {