Issue #1192: On closing of property panel close only current operation

diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp
index 0d9683d9b6a185b4fe99c9186496f8c839168ba4..3e7db245c53121de048ba19dff6925321d67b064 100755 (executable)
--- a/src/XGUI/XGUI_PropertyPanel.cpp
+++ b/src/XGUI/XGUI_PropertyPanel.cpp
@@ -474,8 +474,12 @@ void XGUI_PropertyPanel::closeEvent(QCloseEvent* theEvent)
 {
   ModuleBase_Operation* aOp = myOperationMgr->currentOperation();
   if (aOp) {
-    if (myOperationMgr->abortAllOperations()) {
-      theEvent->accept();
+    if (myOperationMgr->canStopOperation(aOp)) {
+      myOperationMgr->abortOperation(aOp);
+      if (myOperationMgr->hasOperation())
+        theEvent->ignore();
+      else
+        theEvent->accept();
     } else 
       theEvent->ignore();
   } else