set custom command path to emtpy; load customs after defaults

config/settings/espeak.settings.conf

@@ -163,7 +163,7 @@ dateFormat=%A, %B %d, %Y
 autoSpellCheck=True
 spellCheckLanguage=en_US
 scriptPath=/usr/share/fenrir/scripts
-commandPath=/usr/share/fenrir/commands
+commandPath=
 
 [focus]
 cursor=True

config/settings/settings.conf

@@ -147,7 +147,7 @@ interruptOnKeyPressFilter=
 doubleTapTimeout=0.2
 
 [general]
-debugLevel=1
+debugLevel=0
 punctuationProfile=default
 punctuationLevel=some
 respectPunctuationPause=True
@@ -168,7 +168,7 @@ spellCheckLanguage=en_US
 # path for your scripts "scriptKey" functionality
 scriptPath=/usr/share/fenrir/scripts
 # overload commands, and create new one without changing Fenrir default
-commandPath=/usr/share/fenrir/commands
+commandPath=
 
 [focus]
 #follow the text cursor

config/settings/settings.conf.storm

@@ -116,7 +116,7 @@ autoSpellCheck=True
 spellCheckLanguage=en_US
 scriptPath=/usr/share/fenrir/scripts
 # overload commands, and create new one without changing Fenrir default
-commandPath=/usr/share/fenrir/commands
+commandPath=
 
 [focus]
 #follow the text cursor

src/fenrir/core/commandManager.py

@@ -18,9 +18,10 @@ class commandManager():
         self.env['commands'] = {}
         self.env['commandsIgnore'] = {}        
         for commandFolder in self.env['general']['commandFolderList']:
+            self.env['runtime']['commandManager'].loadCommands(commandFolder)        
+            if self.env['runtime']['settingsManager'].getSetting('general', 'commandPath') != '':
                 self.env['runtime']['commandManager'].loadCommands(commandFolder,
                   self.env['runtime']['settingsManager'].getSetting('general', 'commandPath'))        
-            self.env['runtime']['commandManager'].loadCommands(commandFolder)
 
         # scripts for scriptKey
         self.env['runtime']['commandManager'].loadScriptCommands()