From 6799a558e5124c2569722df08629dbe6b4ff4c5c Mon Sep 17 00:00:00 2001 From: chrys Date: Tue, 18 Oct 2016 22:14:14 +0200 Subject: [PATCH] make fenrir find /usr/share/sounds/fenrir/ soundpath --- src/fenrir/core/settingsManager.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fenrir/core/settingsManager.py b/src/fenrir/core/settingsManager.py index 11eda8b3..9656d357 100644 --- a/src/fenrir/core/settingsManager.py +++ b/src/fenrir/core/settingsManager.py @@ -202,9 +202,9 @@ class settingsManager(): else: return None if not os.path.exists(soundRoot): - if os.path.exists(os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/'): - soundRoot = os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/' - + if os.path.exists(os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/sound/'): + soundRoot = os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/sound/' + environment['runtime']['settingsManager'] = self environment['runtime']['settingsManager'].initialize(environment) @@ -226,8 +226,8 @@ class settingsManager(): environment['runtime']['settingsManager'].loadShortcuts(self.getSetting('keyboard','keyboardLayout')) if not os.path.exists(self.getSetting('sound','theme') + '/soundicons.conf'): - if os.path.exists(soundRoot + 'sound/'+ self.getSetting('sound','theme')): - self.setSetting('sound', 'theme', soundRoot + 'sound/'+ self.getSetting('sound','theme')) + if os.path.exists(soundRoot + self.getSetting('sound','theme')): + self.setSetting('sound', 'theme', soundRoot + self.getSetting('sound','theme')) if os.path.exists(self.getSetting('sound','theme') + '/soundicons.conf'): environment['runtime']['settingsManager'].loadSoundIcons(self.getSetting('sound','theme')) else: