To improve VTK connection management

diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.cxx b/src/VVTK/VVTK_SegmentationCursorDlg.cxx
index 1a62c4964fb08fbe26218f48ac925a99342e1f61..d2eaa17e556ebcb875fca3b5e2b9254d240bbf39 100644 (file)
--- a/src/VVTK/VVTK_SegmentationCursorDlg.cxx
+++ b/src/VVTK/VVTK_SegmentationCursorDlg.cxx
@@ -352,15 +352,23 @@ VVTK_SegmentationCursorDlg::VVTK_SegmentationCursorDlg( QWidget* parent, const c
 
 VVTK_SegmentationCursorDlg::~VVTK_SegmentationCursorDlg()
 {
+  SetWidgetCtrl(NULL);
 }
 
 void VVTK_SegmentationCursorDlg::SetWidgetCtrl( VISU_WidgetCtrl* theWidgetCtrl )
 {
+  if(myWidgetCtrl == theWidgetCtrl)
+    return;
+
+  if(myWidgetCtrl)
+    myWidgetCtrl->RemoveObserver(myEventCallbackCommand.GetPointer());
+
   myWidgetCtrl = theWidgetCtrl;
 
-  myWidgetCtrl->AddObserver(vtkCommand::EndInteractionEvent, 
-                           myEventCallbackCommand.GetPointer(), 
-                           myPriority);
+  if(theWidgetCtrl)
+    theWidgetCtrl->AddObserver(vtkCommand::EndInteractionEvent, 
+                              myEventCallbackCommand.GetPointer(), 
+                              myPriority);
 }
 
 void VVTK_SegmentationCursorDlg::ProcessEvents(vtkObject* vtkNotUsed(theObject),