From c15194ded2db40779df2173e0f6b40872f650903 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 16 Nov 2005 08:31:50 +0000 Subject: [PATCH] Fix a bug: close() method of data model is not called --- src/CAM/CAM_Module.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/CAM/CAM_Module.cxx b/src/CAM/CAM_Module.cxx index 4e18bff8f..54a0e118a 100755 --- a/src/CAM/CAM_Module.cxx +++ b/src/CAM/CAM_Module.cxx @@ -129,8 +129,11 @@ void CAM_Module::studyClosed( SUIT_Study* study ) if ( !camDoc ) return; - if ( camDoc->containsDataModel( dataModel() ) ) - camDoc->removeDataModel( dataModel() ); + CAM_DataModel* dm = dataModel(); + if ( dm && camDoc->containsDataModel( dm ) ) { + dm->close(); + camDoc->removeDataModel( dm ); + } } /*!Public slot, do nothing.*/ -- 2.39.2