From 6da406fe18ed59b1ebf0c6c0217a46279b79645c Mon Sep 17 00:00:00 2001 From: blacksun Date: Thu, 29 Oct 2015 15:14:42 +0000 Subject: [PATCH] Bug fix. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4243 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/ui/linksingleelementwidget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sources/ui/linksingleelementwidget.cpp b/sources/ui/linksingleelementwidget.cpp index db9994396..0f317ab95 100644 --- a/sources/ui/linksingleelementwidget.cpp +++ b/sources/ui/linksingleelementwidget.cpp @@ -33,7 +33,7 @@ LinkSingleElementWidget::LinkSingleElementWidget(Element *elmt, QWidget *parent) : AbstractElementPropertiesEditorWidget(parent), ui(new Ui::LinkSingleElementWidget), - esw_(0), + esw_(nullptr), unlink_(false), search_field(nullptr) { @@ -269,6 +269,8 @@ QList LinkSingleElementWidget::availableElements() //find in all diagram of this project if (i == 0) { + if (!m_element->diagram() || !m_element->diagram()->project()) return elmt_list; + ElementProvider ep(m_element->diagram()->project()); if (filter_ & Element::AllReport) elmt_list = ep.freeElement(filter_); @@ -284,6 +286,8 @@ QList LinkSingleElementWidget::availableElements() else elmt_list = ep.find(filter_); } + + //If element is linked, remove is parent from the list if(!m_element->isFree()) elmt_list.removeAll(m_element->linkedElements().first());