From 1c65908cdb1559d7dc7ebbf93d2e1eb9b94197e0 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 12 Sep 2013 10:21:37 +0200 Subject: ConfigPath: simplify the duplicate tilde check --- src/ConfigPath.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/ConfigPath.cxx b/src/ConfigPath.cxx index 9fd3876bf..6bc56b897 100644 --- a/src/ConfigPath.cxx +++ b/src/ConfigPath.cxx @@ -87,11 +87,7 @@ ParsePath(const char *path, Error &error) return Path::Null(); #ifndef WIN32 - if (!g_path_is_absolute(path) && path[0] != '~') { - error.Format(path_domain, - "not an absolute path: %s", path); - return Path::Null(); - } else if (path[0] == '~') { + if (path[0] == '~') { Path home = Path::Null(); if (path[1] == '/' || path[1] == '\0') { @@ -116,6 +112,10 @@ ParsePath(const char *path, Error &error) return Path::Null(); return Path::Build(home, path2); + } else if (!g_path_is_absolute(path)) { + error.Format(path_domain, + "not an absolute path: %s", path); + return Path::Null(); } else { #endif return path2; -- cgit v1.2.3