From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Mon, 7 Oct 2013 07:31:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/KDE/4.11'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/b4efdc620e8ce7571b45d7bfe22f30271871b9f9?hp=-c

Merge remote-tracking branch 'origin/KDE/4.11'
---

b4efdc620e8ce7571b45d7bfe22f30271871b9f9
diff --combined src/dolphinviewcontainer.cpp
index cc26198a0,c8fc757ba..dc51f85f0
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@@ -372,6 -372,10 +372,10 @@@ void DolphinViewContainer::setUrl(cons
  {
      if (newUrl != m_urlNavigator->locationUrl()) {
          m_urlNavigator->setLocationUrl(newUrl);
+     } else if (m_view->itemsCount() == 0) {
+         // Maybe a previously unmounted device has been mounted again.
+         // Let's reload the view to be safe (see https://bugs.kde.org/show_bug.cgi?id=161385).
+         m_view->reload();
      }
  
      #ifdef KActivities_FOUND
@@@ -508,7 -512,8 +512,7 @@@ void DolphinViewContainer::showItemInfo
      if (item.isNull()) {
          m_statusBar->resetToDefaultText();
      } else {
 -        const QString text = item.isDir() ? item.text() : item.getStatusBarInfo();
 -        m_statusBar->setText(text);
 +        m_statusBar->setText(item.getStatusBarInfo());
      }
  }