Issue #2684: Make change of color inside of transaction

diff --git a/src/ModuleBase/ModuleBase_OperationFeature.cpp b/src/ModuleBase/ModuleBase_OperationFeature.cpp
index 04edf79576b5a8e6df3fc796d0b954c6b096f3a9..5ec2646d2d16635e5743912bae8facc91bafa4a8 100755 (executable)
--- a/src/ModuleBase/ModuleBase_OperationFeature.cpp
+++ b/src/ModuleBase/ModuleBase_OperationFeature.cpp
@@ -352,16 +352,17 @@ bool ModuleBase_OperationFeature::commit()
 
     myFeature->setStable(true);
 
-    SessionPtr aMgr = ModelAPI_Session::get();
-    /// Set current feature and remeber old current feature
-
     commitOperation();
-    aMgr->finishOperation();
 
     stopOperation();
     emit stopped();
     emit committed();
 
+    // finishOperation has to be after commited because in signal commited
+    // there is a modification of attribures (color)
+    SessionPtr aMgr = ModelAPI_Session::get();
+    aMgr->finishOperation();
+
     afterCommitOperation();
 #ifdef DEBUG_OPERATION_START
   qDebug("ModuleBase_OperationFeature::commit -- end");