Don't crash (in PreviewJob) when m_shownUrl is empty for some reason.

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index acd51d7d7bc50c556ef1cd52872218b0af8cd7f6..042c74b2c0151b7fa3e324fc4609603dcea72d63 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -89,6 +89,8 @@ DolphinView::DolphinView(QWidget* parent,
 
     m_controller = new DolphinController(this);
     m_controller->setUrl(url);
+    connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
+            this, SIGNAL(urlChanged(const KUrl&)));
     connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
             this, SLOT(openContextMenu(const QPoint&)));
     connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&, QWidget*)),
@@ -415,6 +417,7 @@ void DolphinView::reload()
 void DolphinView::refresh()
 {
     createView();
+    applyViewProperties(m_controller->url());
     reload();
 }
 
@@ -800,13 +803,13 @@ void DolphinView::showHoverInformation(const QModelIndex& index)
 
     const KFileItem* item = fileItem(index);
     if (item != 0) {
-        emit requestItemInfo(item->url());
+        emit requestItemInfo(*item);
     }
 }
 
 void DolphinView::clearHoverInformation()
 {
-    emit requestItemInfo(KUrl());
+    emit requestItemInfo(KFileItem());
 }