From a9cd8b8b1d605ad1f869756b47206ca6980ddb39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 22 Jan 2016 03:31:44 +0100 Subject: Fix forced load of default user actions This resolves Bug 2481 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 76ca48c43dcb5d28da7d4ff79fbfe857fa441a2c) --- krusader/UserAction/useraction.cpp | 8 +++++--- 1 file 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 ) { -- cgit v1.2.1