diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-01-22 03:31:44 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-01-22 03:31:56 +0100 |
| commit | a9cd8b8b1d605ad1f869756b47206ca6980ddb39 (patch) | |
| tree | 7f3b20c43ea786026eafc024e8c8febc77be6d94 | |
| parent | c9d8f68a2e20c7f2418f58a964722621abf68c08 (diff) | |
| download | krusader-a9cd8b8b1d605ad1f869756b47206ca6980ddb39.tar.gz krusader-a9cd8b8b1d605ad1f869756b47206ca6980ddb39.zip | |
Fix forced load of default user actions
This resolves Bug 2481
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 76ca48c43dcb5d28da7d4ff79fbfe857fa441a2c)
| -rw-r--r-- | krusader/UserAction/useraction.cpp | 8 |
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 ) { |