From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Tue, 12 Aug 2014 07:23:24 +0000 (+0200)
Subject: Merge branch 'KDE/4.14'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4b70446c17dff6646c11966670bcbe145d07c685?hp=-c

Merge branch 'KDE/4.14'
---

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