From b5e3ddb908e170310f25f2c64235b04ab1bd43db Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 13 Dec 2005 15:09:59 +0000 Subject: [PATCH] Improve deactivateModule() method: all started operations should be aborted --- src/LightApp/LightApp_Module.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/LightApp/LightApp_Module.cxx b/src/LightApp/LightApp_Module.cxx index 46d3f82af..283c49c89 100644 --- a/src/LightApp/LightApp_Module.cxx +++ b/src/LightApp/LightApp_Module.cxx @@ -121,12 +121,18 @@ bool LightApp_Module::activateModule( SUIT_Study* study ) } /*!Deactivate module.*/ -bool LightApp_Module::deactivateModule( SUIT_Study* ) +bool LightApp_Module::deactivateModule( SUIT_Study* study ) { delete mySwitchOp; mySwitchOp = 0; - return true; + // abort all operations + MapOfOperation::const_iterator anIt; + for( anIt = myOperations.begin(); anIt != myOperations.end(); anIt++ ) { + anIt.data()->abort(); + } + + return CAM_Module::activateModule( study ); } /*!NOT IMPLEMENTED*/ -- 2.39.2