From: nds Date: Fri, 11 Dec 2015 12:42:15 +0000 (+0300) Subject: #1105 Abort boolean operation shows warning dialog twice X-Git-Tag: V_2.1.0~195 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3d5d336ca5036683c3c255805a1d5b749932af1f;p=modules%2Fshaper.git #1105 Abort boolean operation shows warning dialog twice --- diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp index 762bde305..413059e2a 100755 --- a/src/XGUI/XGUI_PropertyPanel.cpp +++ b/src/XGUI/XGUI_PropertyPanel.cpp @@ -334,8 +334,7 @@ void XGUI_PropertyPanel::closeEvent(QCloseEvent* theEvent) { ModuleBase_Operation* aOp = myOperationMgr->currentOperation(); if (aOp) { - if (myOperationMgr->canStopOperation(aOp)) { - myOperationMgr->abortAllOperations(); + if (myOperationMgr->abortAllOperations()) { theEvent->accept(); } else theEvent->ignore();