Fix forced load of default user actions

This resolves Bug 2481

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 5 insertions, 3 deletions

diff --git a/krusader/UserAction/useraction.cpp b/krusader/UserAction/useraction.cpp
index 2313a94..18d6b48 100644
--- a/krusader/UserAction/useraction.cpp
+++ b/krusader/UserAction/useraction.cpp
@@ -77,12 +77,14 @@ TQStringList UserAction::allNames() {
 
 void UserAction::readAllFiles() {
    TQString filename = locate( "data", ACTION_XML ); // locate returns the local file if it exists, else the global one is retrieved.
-   if ( ! filename.isEmpty() )
-      readFromFile( locate( "data", ACTION_XML ), renameDoublicated );
+   if ( ! filename.isEmpty() ) {
+      readFromFile( filename, renameDoublicated );
+      return;
+   }
 
    filename = locate( "data", ACTION_XML_EXAMPLES );
    if ( ! filename.isEmpty() )
-      readFromFile( locate( "data", ACTION_XML_EXAMPLES ), ignoreDoublicated ); // ignore samples which are already in the normal file
+      readFromFile( filename, ignoreDoublicated ); // ignore samples which are already in the normal file
 }
 
 void UserAction::readFromFile( const TQString& filename, ReadMode mode, KrActionList* list ) {