From: vsv <vitaly.smetannikov@opencascade.com>
Date: Sat, 26 Dec 2015 13:44:04 +0000 (+0300)
Subject: Issue #1192: On closing of property panel close only current operation
X-Git-Tag: V_2.1.0~25
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=049ec592481a42696c8c1b18b9f6a19f7187f332;p=modules%2Fshaper.git

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 0d9683d9b..3e7db245c 100755
--- 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