kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 13:30:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5011 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-08-06 11:35:01 +00:00
parent 6e2ed873bb
commit e71fc99464
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/ui/abstractelementpropertieseditorwidget.cpp
View File

@@ -18,6 +18,5 @@
#include "abstractelementpropertieseditorwidget.h" #include "abstractelementpropertieseditorwidget.h"
AbstractElementPropertiesEditorWidget::AbstractElementPropertiesEditorWidget(QWidget *parent) : AbstractElementPropertiesEditorWidget::AbstractElementPropertiesEditorWidget(QWidget *parent) :
PropertiesEditorWidget(parent), PropertiesEditorWidget(parent)
m_element (nullptr)
{} {}

3
sources/ui/abstractelementpropertieseditorwidget.h
View File

@@ -19,6 +19,7 @@
#define ABSTRACTELEMENTPROPERTIESEDITORWIDGET_H #define ABSTRACTELEMENTPROPERTIESEDITORWIDGET_H
#include "PropertiesEditor/propertieseditorwidget.h" #include "PropertiesEditor/propertieseditorwidget.h"
#include "QPointer"
class Element; class Element;
@@ -34,7 +35,7 @@ class AbstractElementPropertiesEditorWidget : public PropertiesEditorWidget
virtual void setElement(Element *element) =0; virtual void setElement(Element *element) =0;
protected: protected:
Element *m_element; QPointer <Element> m_element;
}; };

2
sources/ui/masterpropertieswidget.cpp
View File

@@ -33,7 +33,6 @@
MasterPropertiesWidget::MasterPropertiesWidget(Element *elmt, QWidget *parent) : MasterPropertiesWidget::MasterPropertiesWidget(Element *elmt, QWidget *parent) :
AbstractElementPropertiesEditorWidget(parent), AbstractElementPropertiesEditorWidget(parent),
ui(new Ui::MasterPropertiesWidget), ui(new Ui::MasterPropertiesWidget),
m_showed_element (nullptr),
m_project(nullptr) m_project(nullptr)
{ {
ui->setupUi(this); ui->setupUi(this);
@@ -99,6 +98,7 @@ MasterPropertiesWidget::~MasterPropertiesWidget()
if (m_showed_element) if (m_showed_element)
m_showed_element->setHighlighted(false); m_showed_element->setHighlighted(false);
if(m_element)
m_element->setHighlighted(false); m_element->setHighlighted(false);
delete ui; delete ui;

2
sources/ui/masterpropertieswidget.h
View File

@@ -71,7 +71,7 @@ class MasterPropertiesWidget : public AbstractElementPropertiesEditorWidget
Ui::MasterPropertiesWidget *ui; Ui::MasterPropertiesWidget *ui;
QHash <QTreeWidgetItem *, Element *> m_qtwi_hash; QHash <QTreeWidgetItem *, Element *> m_qtwi_hash;
QTreeWidgetItem *m_qtwi_at_context_menu = nullptr; QTreeWidgetItem *m_qtwi_at_context_menu = nullptr;
Element *m_showed_element; QPointer <Element> m_showed_element;
QETProject *m_project; QETProject *m_project;
QMenu *m_context_menu; QMenu *m_context_menu;
QAction *m_link_action, QAction *m_link_action,