mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-04-02 03:14:29 +05:00
Issue 0020572: EDF 1150 OCC: SIGSEGV when Salome is closing after execution of a GEOM script
Additional fix for GEOM - avoid undesired servant removal by Destroy()
This commit is contained in:
parent
c34e09e68d
commit
f9ddcec31a
@ -52,6 +52,10 @@
|
|||||||
#include <TColStd_MapOfInteger.hxx>
|
#include <TColStd_MapOfInteger.hxx>
|
||||||
#include <TCollection_AsciiString.hxx>
|
#include <TCollection_AsciiString.hxx>
|
||||||
|
|
||||||
|
//To disable automatic genericobj management, the following line should be commented.
|
||||||
|
//Otherwise, it should be uncommented. Refer to KERNEL_SRC/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx
|
||||||
|
//#define WITHGENERICOBJ
|
||||||
|
|
||||||
//================================================================
|
//================================================================
|
||||||
// Function : getActiveView
|
// Function : getActiveView
|
||||||
// Purpose : Get active view window, returns 0 if no open study frame
|
// Purpose : Get active view window, returns 0 if no open study frame
|
||||||
@ -833,10 +837,12 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
|
|||||||
addInStudy( obj, aName.toLatin1().constData() );
|
addInStudy( obj, aName.toLatin1().constData() );
|
||||||
// updateView=false
|
// updateView=false
|
||||||
display( obj, false );
|
display( obj, false );
|
||||||
|
#ifdef WITHGENERICOBJ
|
||||||
// obj has been published in study. Its refcount has been incremented.
|
// obj has been published in study. Its refcount has been incremented.
|
||||||
// It is safe to decrement its refcount
|
// It is safe to decrement its refcount
|
||||||
// so that it will be destroyed when the entry in study will be removed
|
// so that it will be destroyed when the entry in study will be removed
|
||||||
obj->Destroy();
|
obj->Destroy();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// asv : fix of PAL6454. If publish==false, then the original shape
|
// asv : fix of PAL6454. If publish==false, then the original shape
|
||||||
|
Loading…
x
Reference in New Issue
Block a user