┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/views/dolphinview.cpp
diff options
context:
space:
mode:
authorLuca Beltrame <[email protected]>2012-11-20 07:44:59 +0100
committerLuca Beltrame <[email protected]>2012-11-20 07:44:59 +0100
commit59e8f22cd5de7cc1811550d8bac6aacc5c36587c (patch)
treea553d6722ccffc119d7d7e43a49d0a5f1297c4ec /src/views/dolphinview.cpp
parentc73bf691c6f93e4df5401cceeb536e831442c3c0 (diff)
parent96672c166f2acfe56b5a2779562082a0e9fab825 (diff)
Merge branch 'KDE/4.9'
Conflicts: konqueror/settings/kio/kcookiespolicies.cpp [master only changes] konqueror/settings/kio/kcookiespolicies.h [ditto]
Diffstat (limited to 'src/views/dolphinview.cpp')
-rw-r--r--src/views/dolphinview.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index df49634d4..e677613ba 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1182,8 +1182,11 @@ QString DolphinView::viewPropertiesContext() const
void DolphinView::observeCreatedItem(const KUrl& url)
{
- markUrlAsCurrent(url);
- markUrlsAsSelected(QList<KUrl>() << url);
+ if (m_active) {
+ clearSelection();
+ markUrlAsCurrent(url);
+ markUrlsAsSelected(QList<KUrl>() << url);
+ }
}
void DolphinView::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)