From 049ec592481a42696c8c1b18b9f6a19f7187f332 Mon Sep 17 00:00:00 2001 From: vsv Date: Sat, 26 Dec 2015 16:44:04 +0300 Subject: [PATCH] Issue #1192: On closing of property panel close only current operation --- src/XGUI/XGUI_PropertyPanel.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 -- 2.39.2