Merge branch 'KDE/4.14'

[dolphin.git] / src / dolphintabpage.cpp

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index 82be6d59c108bc715250940230b36d8151c1e6e0..23e33c95833b308222afec9f93c8121ea8489928 100644 (file)
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -187,6 +187,10 @@ QByteArray DolphinTabPage::saveState() const
 
 void DolphinTabPage::restoreState(const QByteArray& state)
 {
+    if (state.isEmpty()) {
+        return;
+    }
+
     QByteArray sd = state;
     QDataStream stream(&sd, QIODevice::ReadOnly);
 
@@ -246,7 +250,7 @@ void DolphinTabPage::slotViewActivated()
     }
 
     emit activeViewUrlChanged(activeViewContainer()->url());
-    emit activeViewChanged();
+    emit activeViewChanged(activeViewContainer());
 }
 
 DolphinViewContainer* DolphinTabPage::createViewContainer(const KUrl& url) const