diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.cpp b/src/Mod/Fem/Gui/TaskFemConstraint.cpp index 6bb940a3f0..4254d14ba5 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraint.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraint.cpp @@ -72,6 +72,7 @@ using namespace Gui; TaskFemConstraint::TaskFemConstraint(ViewProviderFemConstraint *ConstraintView,QWidget *parent,const char* pixmapname) : TaskBox(Gui::BitmapFactory().pixmap(pixmapname),tr("FEM constraint parameters"),true, parent) , proxy(nullptr) + , deleteAction(nullptr) , ConstraintView(ConstraintView) , buttonBox(nullptr) , okButton(nullptr) @@ -205,7 +206,7 @@ bool TaskFemConstraint::KeyEvent(QEvent *e) if (e && e->type() == QEvent::ShortcutOverride) { QKeyEvent * kevent = static_cast(e); if (kevent->modifiers() == Qt::NoModifier) { - if (kevent->key() == Qt::Key_Delete) { + if (deleteAction && kevent->key() == Qt::Key_Delete) { kevent->accept(); return true; } @@ -215,7 +216,7 @@ bool TaskFemConstraint::KeyEvent(QEvent *e) else if (e && e->type() == QEvent::KeyPress) { QKeyEvent * kevent = static_cast(e); if (kevent->key() == Qt::Key_Delete) { - if (deleteAction->isEnabled()) + if (deleteAction && deleteAction->isEnabled()) deleteAction->trigger(); return true; } diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp index b6c61be0a5..80ad331a00 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp @@ -64,6 +64,7 @@ TaskDressUpParameters::TaskDressUpParameters(ViewProviderDressUp *DressUpView, b parent) , proxy(0) , DressUpView(DressUpView) + , deleteAction(nullptr) , allowFaces(selectFaces) , allowEdges(selectEdges) { @@ -240,7 +241,7 @@ bool TaskDressUpParameters::KeyEvent(QEvent *e) if (e && e->type() == QEvent::ShortcutOverride) { QKeyEvent * kevent = static_cast(e); if (kevent->modifiers() == Qt::NoModifier) { - if (kevent->key() == Qt::Key_Delete) { + if (deleteAction && kevent->key() == Qt::Key_Delete) { kevent->accept(); return true; } @@ -250,7 +251,7 @@ bool TaskDressUpParameters::KeyEvent(QEvent *e) else if (e && e->type() == QEvent::KeyPress) { QKeyEvent * kevent = static_cast(e); if (kevent->key() == Qt::Key_Delete) { - if (deleteAction->isEnabled()) + if (deleteAction && deleteAction->isEnabled()) deleteAction->trigger(); return true; } diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h index beb92e3ca6..a5d0d48150 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h @@ -69,7 +69,6 @@ protected Q_SLOTS: void createDeleteAction(QListWidget* parentList, QWidget* parentButton); protected: - QAction* deleteAction; void exitSelectionMode(); bool referenceSelected(const Gui::SelectionChanges& msg); bool wasDoubleClicked = false; @@ -86,6 +85,7 @@ protected: protected: QWidget* proxy; ViewProviderDressUp *DressUpView; + QAction* deleteAction; bool allowFaces, allowEdges; selectionModes selectionMode;