fix search for settings.conf
This commit is contained in:
parent
1cbf7c1329
commit
5ccb10d6cc
@ -19,6 +19,7 @@ class fenrirManager():
|
||||
def __init__(self):
|
||||
self.initialized = False
|
||||
cliArgs = self.handleArgs()
|
||||
print(cliArgs)
|
||||
if not cliArgs:
|
||||
return
|
||||
try:
|
||||
|
@ -8,6 +8,7 @@ from core import debug
|
||||
|
||||
generalInformation = {
|
||||
'running': True,
|
||||
'args': None,
|
||||
'tutorialMode': False,
|
||||
'currUser':'',
|
||||
'prevUser':'',
|
||||
|
@ -219,8 +219,8 @@ class settingsManager():
|
||||
return None
|
||||
# get settings file
|
||||
if not os.path.exists(settingsFile):
|
||||
if os.path.exists(settingsRoot + '/settings/' + settingsFile):
|
||||
settingsFile = settingsRoot + '/settings/' + settingsFile
|
||||
if os.path.exists(settingsRoot + '/settings/settings.conf'):
|
||||
settingsFile = settingsRoot + '/settings/settings.conf'
|
||||
else:
|
||||
return None
|
||||
# get sound themes root
|
||||
@ -234,7 +234,7 @@ class settingsManager():
|
||||
validConfig = environment['runtime']['settingsManager'].loadSettings(settingsFile)
|
||||
if not validConfig:
|
||||
return None
|
||||
|
||||
#print(cliArgs.options)
|
||||
self.setFenrirKeys(self.getSetting('general','fenrirKeys'))
|
||||
self.setScriptKeys(self.getSetting('general','scriptKeys'))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user