diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 163da54dda..34bd6f688d 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -59,6 +59,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, bool showHiddenFiles) : QWidget(parent), m_showProgress(false), + m_blockContentsMovedSignal(false), m_mode(mode), m_iconSize(0), m_folderCount(0), @@ -731,6 +732,7 @@ void DolphinView::updateItemCount() updateStatusBar(); + m_blockContentsMovedSignal = false; QTimer::singleShot(0, this, SLOT(restoreContentsPos())); } @@ -821,6 +823,7 @@ void DolphinView::startDirLister(const KUrl& url, bool reload) m_statusBar->setProgress(0); } + m_blockContentsMovedSignal = true; m_dirLister->stop(); m_dirLister->openUrl(url, false, reload); } @@ -1000,8 +1003,6 @@ void DolphinView::dropUrls(const KUrl::List& urls, const KUrl& destination = (directory == 0) ? url() : directory->url(); - kDebug() << "DolphinView::dropUrls() - destination: " << destination.prettyUrl() << endl; - dropUrls(urls, destination); } @@ -1034,7 +1035,9 @@ void DolphinView::updateSortOrder(Qt::SortOrder order) void DolphinView::emitContentsMoved() { - emit contentsMoved(contentsX(), contentsY()); + if (!m_blockContentsMovedSignal) { + emit contentsMoved(contentsX(), contentsY()); + } } void DolphinView::updateActivationState() diff --git a/src/dolphinview.h b/src/dolphinview.h index fd47e1fae2..e00cc98f27 100644 --- a/src/dolphinview.h +++ b/src/dolphinview.h @@ -543,6 +543,7 @@ private: private: bool m_showProgress; + bool m_blockContentsMovedSignal; Mode m_mode; int m_iconSize;