Providing Action class to have a common approach to start/finish/abort model transact...

[modules/shaper.git] / src / XGUI / XGUI_OperationMgr.cpp

diff --git a/src/XGUI/XGUI_OperationMgr.cpp b/src/XGUI/XGUI_OperationMgr.cpp
index 52826dc65b0f20801353c2328c4055d229bb05bd..259d3411d4aac5f85da5bcc76dc4cec6131f7ad1 100644 (file)
--- a/src/XGUI/XGUI_OperationMgr.cpp
+++ b/src/XGUI/XGUI_OperationMgr.cpp
@@ -117,9 +117,11 @@ bool XGUI_OperationMgr::startOperation(ModuleBase_Operation* theOperation)
   connect(theOperation, SIGNAL(committed()), SLOT(onOperationCommitted()));
   connect(theOperation, SIGNAL(stopped()), SLOT(onOperationStopped()));
   connect(theOperation, SIGNAL(resumed()), SLOT(onOperationResumed()));
-  connect(theOperation, SIGNAL(triggered(bool)), SLOT(onOperationTriggered(bool)));
-  connect(theOperation, SIGNAL(activatedByPreselection()),
-          SIGNAL(operationActivatedByPreselection()));
+  ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+                                                                        (theOperation);
+  if (aFOperation)
+    connect(aFOperation, SIGNAL(activatedByPreselection()),
+            SIGNAL(operationActivatedByPreselection()));
 
   theOperation->start();
   onValidateOperation();
@@ -273,7 +275,7 @@ bool XGUI_OperationMgr::canStartOperation(QString theId)
   if (aCurrentOp) {
     if (!aCurrentOp->isGranted(theId)) {
       if (canStopOperation()) {
-        if (myIsApplyEnabled)
+        if (myIsApplyEnabled && aCurrentOp->isModified())
           aCurrentOp->commit();
         else
           abortOperation(aCurrentOp);