Merge branch 'master' into processing

This commit is contained in:
chrys 2017-07-27 00:05:46 +02:00
commit 1fec8bd464

View File

@ -271,7 +271,7 @@ class settingsManager():
return None return None
# get sound themes root # get sound themes root
if not os.path.exists(soundRoot): if not os.path.exists(soundRoot):
if os.path.exists(fenrirPath +' /../../config/sound/'): if os.path.exists(fenrirPath + '/../../config/sound/'):
soundRoot = fenrirPath + '/../../config/sound/' soundRoot = fenrirPath + '/../../config/sound/'
environment['runtime']['settingsManager'] = self environment['runtime']['settingsManager'] = self