From kde-commits Wed Apr 30 21:20:45 2014 From: Wojciech Kosowicz Date: Wed, 30 Apr 2014 21:20:45 +0000 To: kde-commits Subject: [calligra] kexi/kexiutils: Fixed crash when trying to modifying table field in form in DebugGUI Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=139889285532125 Git commit bd2d0c2ffc211dd8296ab90df95aea64cf94495e by Wojciech Kosowicz. Committed on 30/04/2014 at 21:07. Pushed by wkosowicz into branch 'master'. Fixed crash when trying to modifying table field in form in DebugGUI BUG: 333933 REVIEW:117797 M +10 -5 kexi/kexiutils/debuggui.cpp http://commits.kde.org/calligra/bd2d0c2ffc211dd8296ab90df95aea64cf94495e diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp index fb22bfb..7fbe94b 100644 --- a/kexi/kexiutils/debuggui.cpp +++ b/kexi/kexiutils/debuggui.cpp @@ -138,7 +138,7 @@ static void addAlterTableActionDebug(const QString& tex= t, int nestingLevel) //kDebug() << "availableNestingLevels: " << availableNestingLevels; //go up (availableNestingLevels-levelsToGoUp) levels lastItem =3D kexiAlterTableActionDebugPage->invisibleRootItem()->child( - kexiAlterTableActionDebugPage->invisibleRootItem()->childCount()); + kexiAlterTableActionDebugPage->invisibleRootItem()->childCount()-1= ); int levelsToGoUp =3D availableNestingLevels - nestingLevel; while (levelsToGoUp > 0 && lastItem) { lastItem =3D lastItem->parent(); @@ -154,15 +154,20 @@ static void addAlterTableActionDebug(const QString& t= ext, int nestingLevel) } } else { lastItem =3D kexiAlterTableActionDebugPage->invisibleRootItem()->c= hild( - kexiAlterTableActionDebugPage->invisibleRootItem()->childCount= ()); + kexiAlterTableActionDebugPage->invisibleRootItem()->childCount= ()-1); while (lastItem && lastItem->parent()) { lastItem =3D lastItem->parent(); } //kDebug() << "lastItem2: " << (lastItem ? lastItem->text(0) : QSt= ring()); - li =3D new QTreeWidgetItem(lastItem->parent(), lastItem); //after + if (lastItem && lastItem->parent()) + li =3D new QTreeWidgetItem(lastItem->parent(), lastItem); /= /after + else if (!lastItem) + li =3D new QTreeWidgetItem(kexiAlterTableActionDebugPage->inv= isibleRootItem()); + else if (!lastItem->parent()) + li =3D new QTreeWidgetItem(kexiAlterTableActionDebugPage->inv= isibleRootItem(), lastItem); } - li->setText(0, text); - li->setExpanded(true); + li->setText(0, text); + li->setExpanded(true); } = QWidget *KexiUtils::createDebugWindow(QWidget *parent)