From 0d63feed1bb165af895fe997c0dd456da4d08ccb Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Sun, 21 Nov 2010 12:36:45 +0000 Subject: [PATCH] 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 --- src/views/dolphindetailsview.cpp | 4 +++- src/views/dolphiniconsview.cpp | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/dolphindetailsview.cpp b/src/views/dolphindetailsview.cpp index 83460163c..64f964aa8 100644 --- a/src/views/dolphindetailsview.cpp +++ b/src/views/dolphindetailsview.cpp @@ -138,7 +138,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, this, SLOT(slotShowPreviewChanged())); - setFocus(); viewport()->installEventFilter(this); connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)), @@ -159,6 +158,9 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, KDirLister *dirLister = qobject_cast(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() diff --git a/src/views/dolphiniconsview.cpp b/src/views/dolphiniconsview.cpp index 636bdd66c..ce7265af7 100644 --- 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); - setFocus(); - 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() -- 2.47.3