From 892a50443005d65271a34eebf51fa82c3429ecef Mon Sep 17 00:00:00 2001 From: Etoh Date: Sun, 20 Apr 2014 16:59:49 +0100 Subject: [PATCH] Skip rel config for HOME .syncplay file (FS#119) --- syncplay/ui/ConfigurationGetter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/syncplay/ui/ConfigurationGetter.py b/syncplay/ui/ConfigurationGetter.py index 6349153..625e876 100644 --- a/syncplay/ui/ConfigurationGetter.py +++ b/syncplay/ui/ConfigurationGetter.py @@ -271,10 +271,10 @@ class ConfigurationGetter(object): for location in locations: for name in constants.CONFIG_NAMES: path = location + os.path.sep + name - if(os.path.isfile(path)): + if(os.path.isfile(path) and (os.name == 'nt' or path != os.path.join(os.getenv('HOME', '.'), constants.DEFAULT_CONFIG_NAME_LINUX))): loadedPaths.append("'" + os.path.normpath(path) + "'") - self._parseConfigFile(path, createConfig=False) - self._checkConfig() + self._parseConfigFile(path, createConfig=False) + self._checkConfig() return loadedPaths def getConfiguration(self):