don't call deleteLater on a null pointer, gives "QCoreApplication::postEvent: Unexpec...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index dff8120c71edb4ac5f065a3d9ec3d8576185105c..85bc21c771579384dc0bfc10992d40f12b4dbd64 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -246,7 +246,7 @@ void DolphinView::setMode(Mode mode)
     emit modeChanged();
 
     updateZoomLevel(oldZoomLevel);
-    if (m_showPreview) {
+    if (m_showPreview) {   
         loadDirectory(viewPropsUrl);
     }
 }
@@ -1173,7 +1173,6 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
         connect(m_viewAccessor.dirLister(), SIGNAL(completed()), this, SLOT(restoreSelection()));
     }
 
-    m_viewAccessor.dirLister()->stop();
     m_viewAccessor.dirLister()->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
 }
 
@@ -1417,7 +1416,8 @@ void DolphinView::ViewAccessor::deleteView()
     m_iconsView = 0;
     m_detailsView = 0;
 
-    m_columnsContainer->deleteLater();
+    if (m_columnsContainer)
+        m_columnsContainer->deleteLater();
     m_columnsContainer = 0;
 }