Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Save loadedRelativePaths into _config

Browse Source
This commit is contained in:
Etoh 2014-04-18 13:35:55 +01:00
parent e99e8d9e10
commit 9934b0d334
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syncplay/ui/ConfigurationGetter.py
View File

@ -268,11 +268,15 @@ class ConfigurationGetter(object):
def _loadRelativeConfiguration(self): def _loadRelativeConfiguration(self):
locations = self.__getRelativeConfigLocations() locations = self.__getRelativeConfigLocations()
loadedPaths = []
for location in locations: for location in locations:
for name in constants.CONFIG_NAMES: for name in constants.CONFIG_NAMES:
path = location + os.path.sep + name path = location + os.path.sep + name
if(os.path.isfile(path)):
loadedPaths.append("'" + os.path.normpath(path) + "'")
self._parseConfigFile(path, createConfig=False) self._parseConfigFile(path, createConfig=False)
self._checkConfig() self._checkConfig()
return loadedPaths
def getConfiguration(self): def getConfiguration(self):
iniPath = self._getConfigurationFilePath() iniPath = self._getConfigurationFilePath()
@ -285,7 +289,7 @@ class ConfigurationGetter(object):
self._checkConfig() self._checkConfig()
self._saveConfig(iniPath) self._saveConfig(iniPath)
if(self._config['file']): if(self._config['file']):
self._loadRelativeConfiguration() self._config['loadedRelativePaths'] = self._loadRelativeConfiguration()
if(not self._config['noGui']): if(not self._config['noGui']):
from syncplay.vendor import qt4reactor from syncplay.vendor import qt4reactor
if QCoreApplication.instance() is None: if QCoreApplication.instance() is None: