Merge branch 'master' into processing

2017-07-27 00:05:46 +02:00 · 2017-07-27 00:05:46 +02:00 · 1fec8bd464
commit 1fec8bd464
parent 8e52be8aa9 af7d314084
1 changed files with 1 additions and 1 deletions
--- a/src/fenrir/core/settingsManager.py
+++ b/src/fenrir/core/settingsManager.py
@ -271,7 +271,7 @@ class settingsManager():
                return None            
        # get sound themes root
        if not os.path.exists(soundRoot):
-            if os.path.exists(fenrirPath +' /../../config/sound/'):
+            if os.path.exists(fenrirPath + '/../../config/sound/'):
                soundRoot = fenrirPath + '/../../config/sound/'

        environment['runtime']['settingsManager'] = self