Changeset 8642 for trunk/MagicSoft/Mars/mfileio

Timestamp:

07/18/07 20:30:13 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -101 +101 @@
     //fTrees.SetOwner();
 
-    gROOT->GetListOfCleanups()->Add(this); // To remove fDisplay
-    SetBit(kMustCleanup);
+    gROOT->GetListOfCleanups()->Add(this); // To remove fOut if deleted
 }
 
@@ -133 +132 @@
 
         file->SetOption(option); // IMPORTANT!
+        file->SetBit(kMustCleanup);
         ResetBit(kIsNotOwner);
         return file;
@@ -227 +227 @@
     {
         fOut = new TFile("/dev/null", "READ", ftitle, comp);
+        fOut->SetBit(kMustCleanup);
         return;
     }
@@ -1071 +1072 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// If the output file is deleted set fOut to NULL.
+// Call MTask::RecursiveRemove
+//
 void MWriteRootFile::RecursiveRemove(TObject *obj)
 {
     if (obj==fOut)
-        fOut=0;
+        fOut=NULL;
+
+    MWriteFile::RecursiveRemove(obj);
 }