From a4ba895e02d33a6e48eff28cc37c9886630babb6 Mon Sep 17 00:00:00 2001 From: blacksun Date: Sun, 22 Jan 2017 16:47:18 +0000 Subject: [PATCH] Fix crash git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4868 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/ui/masterpropertieswidget.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/sources/ui/masterpropertieswidget.cpp b/sources/ui/masterpropertieswidget.cpp index 4f57f4d96..964a17c1b 100644 --- a/sources/ui/masterpropertieswidget.cpp +++ b/sources/ui/masterpropertieswidget.cpp @@ -260,10 +260,14 @@ void MasterPropertiesWidget::on_link_button_clicked() { //take the curent item from free_list and push it to linked_list QTreeWidgetItem *qtwi = ui->m_free_tree_widget->currentItem(); - ui->m_free_tree_widget->takeTopLevelItem(ui->m_free_tree_widget->indexOfTopLevelItem(qtwi)); - ui->m_link_tree_widget->insertTopLevelItem(0, qtwi); - - if(m_live_edit) apply(); + if (qtwi) + { + ui->m_free_tree_widget->takeTopLevelItem(ui->m_free_tree_widget->indexOfTopLevelItem(qtwi)); + ui->m_link_tree_widget->insertTopLevelItem(0, qtwi); + + if(m_live_edit) + apply(); + } } /** @@ -274,10 +278,14 @@ void MasterPropertiesWidget::on_unlink_button_clicked() { //take the curent item from linked_list and push it to free_list QTreeWidgetItem *qtwi = ui->m_link_tree_widget->currentItem(); - ui->m_link_tree_widget->takeTopLevelItem(ui->m_link_tree_widget->indexOfTopLevelItem(qtwi)); - ui->m_free_tree_widget->insertTopLevelItem(0, qtwi); + if(qtwi) + { + ui->m_link_tree_widget->takeTopLevelItem(ui->m_link_tree_widget->indexOfTopLevelItem(qtwi)); + ui->m_free_tree_widget->insertTopLevelItem(0, qtwi); - if(m_live_edit) apply(); + if(m_live_edit) + apply(); + } } /**