storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix search for settings.conf

Browse Source
This commit is contained in:
chrys 2017-05-05 23:39:17 +02:00
parent 1cbf7c1329
commit 5ccb10d6cc
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fenrir/core/fenrirManager.py
View File

@ -19,6 +19,7 @@ class fenrirManager():
def __init__(self): def __init__(self):
self.initialized = False self.initialized = False
cliArgs = self.handleArgs() cliArgs = self.handleArgs()
print(cliArgs)
if not cliArgs: if not cliArgs:
return return
try: try:

1
src/fenrir/core/generalInformation.py
View File

@ -8,6 +8,7 @@ from core import debug
generalInformation = { generalInformation = {
'running': True, 'running': True,
'args': None,
'tutorialMode': False, 'tutorialMode': False,
'currUser':'', 'currUser':'',
'prevUser':'', 'prevUser':'',

6
src/fenrir/core/settingsManager.py
View File

@ -219,8 +219,8 @@ class settingsManager():
return None return None
# get settings file # get settings file
if not os.path.exists(settingsFile): if not os.path.exists(settingsFile):
if os.path.exists(settingsRoot + '/settings/' + settingsFile): if os.path.exists(settingsRoot + '/settings/settings.conf'):
settingsFile = settingsRoot + '/settings/' + settingsFile settingsFile = settingsRoot + '/settings/settings.conf'
else: else:
return None return None
# get sound themes root # get sound themes root
@ -234,7 +234,7 @@ class settingsManager():
validConfig = environment['runtime']['settingsManager'].loadSettings(settingsFile) validConfig = environment['runtime']['settingsManager'].loadSettings(settingsFile)
if not validConfig: if not validConfig:
return None return None
#print(cliArgs.options)
self.setFenrirKeys(self.getSetting('general','fenrirKeys')) self.setFenrirKeys(self.getSetting('general','fenrirKeys'))
self.setScriptKeys(self.getSetting('general','scriptKeys')) self.setScriptKeys(self.getSetting('general','scriptKeys'))