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 76ca48c43d)
r14.0.x
Slávek Banko 9 years ago
parent c9d8f68a2e
commit a9cd8b8b1d

@ -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 ) {

Loading…
Cancel
Save