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

List:       kde-commits
Subject:    [digikam/frameworks] utilities/importui/main: backport commits #42838bc967a87638c7d76f87a4f44add9966
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2015-04-29 13:19:43
Message-ID: E1YnRtv-00044s-LZ () scm ! kde ! org
[Download RAW message or body]

Git commit 336cb1696b45e1272b5c5e759f169f9bc48c740f by Gilles Caulier.
Committed on 29/04/2015 at 13:18.
Pushed by cgilles into branch 'frameworks'.

backport commits #42838bc967a87638c7d76f87a4f44add99665d53 and \
                #9585ee545003a85c4b45c39bf30939634a40ce7d from git/master to \
                frameworks branch
CCBUGS: 346646

M  +5    -3    utilities/importui/main/importui.cpp

http://commits.kde.org/digikam/336cb1696b45e1272b5c5e759f169f9bc48c740f

diff --git a/utilities/importui/main/importui.cpp \
b/utilities/importui/main/importui.cpp index 66d3fff..68db1ed 100644
--- a/utilities/importui/main/importui.cpp
+++ b/utilities/importui/main/importui.cpp
@@ -1645,6 +1645,11 @@ void ImportUI::slotLocked(const QString& folder, const \
QString& file, bool statu  
 void ImportUI::slotUpdateDownloadName()
 {
+    if (d->busy)
+    {
+        return;
+    }
+
     d->view->setIconViewUpdatesEnabled(false);
 
     bool noSelection          = d->view->selectedCamItemInfos().count() == 0;
@@ -1707,8 +1712,6 @@ void ImportUI::slotUpdateDownloadName()
 //FIXME: the new pictures are marked by CameraHistoryUpdater which is not working \
yet.  void ImportUI::slotSelectNew()
 {
-    blockSignals(true);
-
     CamItemInfoList infos = d->view->allItems();
     CamItemInfoList toBeSelected;
 
@@ -1721,7 +1724,6 @@ void ImportUI::slotSelectNew()
     }
 
     d->view->setSelectedCamItemInfos(toBeSelected);
-    blockSignals(false);
 }
 
 void ImportUI::slotSelectLocked()


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