[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] libs/tags: fix double signal from the AddTagsLineEdit
From:       Maik Qualmann <null () kde ! org>
Date:       2017-01-31 18:54:27
Message-ID: E1cYdZT-0005uB-3B () code ! kde ! org
[Download RAW message or body]

Git commit e23e4693169bf406e950e66d2377dee84a3ae866 by Maik Qualmann.
Committed on 31/01/2017 at 18:53.
Pushed by mqualmann into branch 'master'.

fix double signal from the AddTagsLineEdit
CCBUGS: 375770

M  +10   -2    libs/tags/addtagslineedit.cpp

https://commits.kde.org/digikam/e23e4693169bf406e950e66d2377dee84a3ae866

diff --git a/libs/tags/addtagslineedit.cpp b/libs/tags/addtagslineedit.cpp
index a154735af4..d69931d475 100644
--- a/libs/tags/addtagslineedit.cpp
+++ b/libs/tags/addtagslineedit.cpp
@@ -165,7 +165,7 @@ void AddTagsLineEdit::slotReturnPressed()
         //focus back to mainview
         emit taggingActionFinished();
     }
-    else
+    else if (!d->currentTaggingAction.isValid())
     {
         emit taggingActionActivated(currentTaggingAction());
     }
@@ -179,7 +179,15 @@ void AddTagsLineEdit::slotEditingFinished()
 void AddTagsLineEdit::slotTextEdited(const QString& text)
 {
     d->currentTaggingAction = TaggingAction();
-    setCurrentTaggingAction(currentTaggingAction());
+
+    if (text.isEmpty())
+    {
+        emit taggingActionSelected(TaggingAction());
+    }
+    else
+    {
+        emit taggingActionSelected(TaggingActionFactory::defaultTaggingAction(text, d->parentTagId));
+    }
 
     d->completer->update(text);
 }
[prev in list] [next in list] [prev in thread] [next in thread]