Extend NetworkError to take a detail parameter.

[dcpomatic.git] / src / lib / cross_windows.cc

diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc
index 486e9b5d588748cc56d738f035edfbdfd084103b..a425186f1816d88cf4b3559ad64c1514245a8b12 100644 (file)
--- a/src/lib/cross_windows.cc
+++ b/src/lib/cross_windows.cc
@@ -255,14 +255,17 @@ fix_long_path (boost::filesystem::path long_path)
 {
        using namespace boost::filesystem;
 
-       path fixed = "\\\\?\\";
-       if (boost::algorithm::starts_with(long_path.string(), fixed.string())) {
+       if (boost::algorithm::starts_with(long_path.string(), "\\\\")) {
+               /* This could mean it starts with \\ (i.e. a SMB path) or \\?\ (a long path)
+                * or a variety of other things... anyway, we'll leave it alone.
+                */
                return long_path;
        }
 
        /* We have to make the path canonical but we can't call canonical() on the long path
         * as it will fail.  So we'll sort of do it ourselves (possibly badly).
         */
+       path fixed = "\\\\?\\";
        if (long_path.is_absolute()) {
                fixed += long_path.make_preferred();
        } else {
@@ -394,7 +397,7 @@ maybe_open_console ()
 boost::filesystem::path
 home_directory ()
 {
-       return boost::filesystem::path(getenv("HOMEDRIVE")) / boost::filesystem::path(getenv("HOMEPATH"));
+       return boost::filesystem::path(getenv("userprofile"));
 }
 
 
@@ -672,11 +675,14 @@ Drive::unmount ()
 
 
 boost::filesystem::path
-config_path ()
+config_path (optional<string> version)
 {
        boost::filesystem::path p;
        p /= g_get_user_config_dir ();
        p /= "dcpomatic2";
+       if (version) {
+               p /= *version;
+       }
        return p;
 }