From fd3679fb6bd7f0786a7ccfb698cd372facb74294 Mon Sep 17 00:00:00 2001 From: KeyboardCombination Date: Sun, 9 Apr 2023 19:30:23 -0400 Subject: [PATCH] Removing useless check --- src/source/DataModelV2/DataModelInstance.cpp | 1 - src/source/Listener/GUDButtonListener.cpp | 14 ++++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/source/DataModelV2/DataModelInstance.cpp b/src/source/DataModelV2/DataModelInstance.cpp index 0b0d7c6..8fe3380 100644 --- a/src/source/DataModelV2/DataModelInstance.cpp +++ b/src/source/DataModelV2/DataModelInstance.cpp @@ -471,7 +471,6 @@ bool DataModelInstance::scanXMLObject(xml_node<> * scanNode) { return false; } - } } /* diff --git a/src/source/Listener/GUDButtonListener.cpp b/src/source/Listener/GUDButtonListener.cpp index c689967..b6032ff 100644 --- a/src/source/Listener/GUDButtonListener.cpp +++ b/src/source/Listener/GUDButtonListener.cpp @@ -72,15 +72,13 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button) for(size_t i = 0; i < SelectionSvc->getSelection().size(); i++) { Instance* selection = SelectionSvc->getSelection()[i]; - if(selection->canDelete && selection->getClassName() == "GroupInstance") + + if(GroupInstance* model = dynamic_cast(selection)) { - if(GroupInstance* model = dynamic_cast(SelectionSvc->getSelection()[i])) - { - newinst = model->unGroup(); - model->setParent(NULL); - delete model; - model = NULL; - } + newinst = model->unGroup(); + model->setParent(NULL); + delete model; + model = NULL; } } SelectionSvc->clearSelection();