From 23318a595c6902857eec87185e9980dd41f4c2ad Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 18 Jun 2014 13:38:23 +0400 Subject: [PATCH] Avoid calling FinishOperation() when operation is just started. --- src/GEOMBase/GEOM_Operation.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/GEOMBase/GEOM_Operation.cxx b/src/GEOMBase/GEOM_Operation.cxx index 1ecd8888d..614868aeb 100644 --- a/src/GEOMBase/GEOM_Operation.cxx +++ b/src/GEOMBase/GEOM_Operation.cxx @@ -59,6 +59,7 @@ void GEOM_Operation::startOperation() if ( !myIOperation->_is_nil() ) { try { myIOperation->StartOperation(); + setState( Running ); } catch ( const SALOME::SALOME_Exception& e ) { SalomeApp_Tools:: QtCatchCorbaException( e ); @@ -74,9 +75,13 @@ void GEOM_Operation::commitOperation() { SUIT_Operation::commitOperation(); + if ( state() != Running ) + return; + if ( !myIOperation->_is_nil() ) { try { myIOperation->FinishOperation(); + setState( Waiting ); } catch ( const SALOME::SALOME_Exception& e ) { SalomeApp_Tools:: QtCatchCorbaException( e );