In the item view constructors, call setFocus() only after

m_extensionsFactory is initialised. This fixes a possible crash in
Konqueror when changing the settings or manipulating tabs.

CCBUG: 240374

svn path=/trunk/KDE/kdebase/apps/; revision=1199276

diff --git a/src/views/dolphindetailsview.cpp b/src/views/dolphindetailsview.cpp
index 83460163caa37fb4a0f3f47b76fb0beb9bf82ed6..64f964aa862e1df2a3ca6fa367b6a415c566e4e6 100644 (file)
--- a/src/views/dolphindetailsview.cpp
+++ b/src/views/dolphindetailsview.cpp
@@ -138,7 +138,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
             this, SLOT(slotShowPreviewChanged()));
 
 
             this, SLOT(slotShowPreviewChanged()));
 
 

-    setFocus();

     viewport()->installEventFilter(this);
 
     connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)),
     viewport()->installEventFilter(this);
 
     connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)),


@@ -159,6 +158,9 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
 
     KDirLister *dirLister = qobject_cast<KDirModel*>(proxyModel->sourceModel())->dirLister();
     connect(dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(resizeColumns()));
 
     KDirLister *dirLister = qobject_cast<KDirModel*>(proxyModel->sourceModel())->dirLister();
     connect(dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(resizeColumns()));

+
+    // setFocus() must be called after m_extensionsFactory is initialised (see bug 240374).
+    setFocus();

 }
 
 DolphinDetailsView::~DolphinDetailsView()
 }
 
 DolphinDetailsView::~DolphinDetailsView()

diff --git a/src/views/dolphiniconsview.cpp b/src/views/dolphiniconsview.cpp
index 636bdd66c1ac4d7e9e87b6367a3b15a2f407ebf2..ce7265af702c134e7c8c1e2ffe8fc17e6d4616d1 100644 (file)
--- a/src/views/dolphiniconsview.cpp
+++ b/src/views/dolphiniconsview.cpp
@@ -121,13 +121,14 @@ DolphinIconsView::DolphinIconsView(QWidget* parent,
     connect(m_categoryDrawer, SIGNAL(actionRequested(int,QModelIndex)), this, SLOT(categoryDrawerActionRequested(int,QModelIndex)));
     setCategoryDrawer(m_categoryDrawer);
 
     connect(m_categoryDrawer, SIGNAL(actionRequested(int,QModelIndex)), this, SLOT(categoryDrawerActionRequested(int,QModelIndex)));
     setCategoryDrawer(m_categoryDrawer);
 

-    setFocus();
-

     connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)),
             this, SLOT(slotGlobalSettingsChanged(int)));
 
     updateGridSize(view->showPreview(), 0);
     m_extensionsFactory = new ViewExtensionsFactory(this, dolphinViewController, viewModeController);
     connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)),
             this, SLOT(slotGlobalSettingsChanged(int)));
 
     updateGridSize(view->showPreview(), 0);
     m_extensionsFactory = new ViewExtensionsFactory(this, dolphinViewController, viewModeController);

+
+    // setFocus() must be called after m_extensionsFactory is initialised (see bug 240374).
+    setFocus();

 }
 
 DolphinIconsView::~DolphinIconsView()
 }
 
 DolphinIconsView::~DolphinIconsView()