From 5861442f6f20b6df88b66aa8805c20deb63b2353 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Mon, 4 Aug 2008 15:50:56 +0000 Subject: [PATCH] Fix for preferences crash by Vincent van Ravesteijn. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26054 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/PanelStack.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt4/PanelStack.cpp b/src/frontends/qt4/PanelStack.cpp index 69158e1a8e..596096715b 100644 --- a/src/frontends/qt4/PanelStack.cpp +++ b/src/frontends/qt4/PanelStack.cpp @@ -117,15 +117,20 @@ void PanelStack::setCurrentPanel(QString const & name) void PanelStack::switchPanel(QTreeWidgetItem * item, QTreeWidgetItem * previous) { + // do nothing when clicked on whitespace (item=NULL) + if( !item ) + return; + // if we have a category, expand the tree and go to the // first item if (item->childCount() > 0) { item->setExpanded(true); - if (previous != item->child(0)) - list_->setCurrentItem(item->child(0)); + if (previous && previous->parent() != item) + switchPanel( item->child(0), previous ); } - if (QWidget * w = widget_map_.value(item, 0)) - stack_->setCurrentWidget(w); + else + if (QWidget * w = widget_map_.value(item, 0)) + stack_->setCurrentWidget(w); } -- 2.39.5