summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-01-22 03:31:44 +0100
committerSlávek Banko <slavek.banko@axis.cz>2016-01-22 03:31:44 +0100
commit76ca48c43dcb5d28da7d4ff79fbfe857fa441a2c (patch)
tree0946cf60e92cca8910f6570f05bfdbd1cc530846
parent655c7b4389f868e1e51bd6b9a799e542749acd22 (diff)
downloadkrusader-76ca48c43dcb5d28da7d4ff79fbfe857fa441a2c.tar.gz
krusader-76ca48c43dcb5d28da7d4ff79fbfe857fa441a2c.zip
Fix forced load of default user actions
This resolves Bug 2481 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--krusader/UserAction/useraction.cpp8
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 ) {