Changeset 1600 for trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

Timestamp:

11/13/02 17:03:19 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -154 +154 @@
     // delete fGeomCam;
 
-    // Maybe harmfull! Don't exchange the order!
-    if (fIsAllocated && fDrawingPad->GetListOfPrimitives()->FindObject(this)==this)
-    {
-        fDrawingPad->RecursiveRemove(this);
-        delete fDrawingPad;
-    }
+    // Not allocated by MCamDisplay or already deleted by the user
+    if (!fIsAllocated || !gROOT->GetListOfCanvases()->FindObject(fDrawingPad))
+        return;
+
+    // If it is not already removed make sure that nothing of this object
+    // maybe be deleted automatically by the canvas destructor
+    if (!fDrawingPad->GetListOfPrimitives()->FindObject(this))
+        return;
+
+    fDrawingPad->RecursiveRemove(this);
+    delete fDrawingPad;
 }