Fix crash

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index fbaa6fe49bbfff9441f1ebd502455d9a6906017b..43d6fd1378d3b7bdfc8519bdaa79ecf1f64bce83 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -358,6 +358,8 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
         item = m_dirLister->rootItem();
         if (item.isNull())
             item = KFileItem( S_IFDIR, (mode_t)-1, url() );
+        else
+            item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799)
     }
 
     // TODO: We should change the signature of the slots (and signals) for being able
@@ -444,6 +446,18 @@ void DolphinPart::slotRequestUrlChange(const KUrl& url)
 
 ////
 
+void DolphinPartBrowserExtension::restoreState(QDataStream &stream)
+{
+    KParts::BrowserExtension::restoreState(stream);
+    m_part->view()->restoreState(stream);
+}
+
+void DolphinPartBrowserExtension::saveState(QDataStream &stream)
+{
+    KParts::BrowserExtension::saveState(stream);
+    m_part->view()->saveState(stream);
+}
+
 void DolphinPartBrowserExtension::cut()
 {
     m_part->view()->cutSelectedItems();