Changeset 8642 for trunk/MagicSoft/Mars/mbase/MTask.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MTask.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -147 +147 @@
 {
     fFilter=filter;
-    if (filter)
-        AddToBranchList(filter->GetDataMember());
+    if (!filter)
+        return;
+
+    fFilter->SetBit(kMustCleanup);    // Better is better ;-)
+    AddToBranchList(filter->GetDataMember());
 }
 
@@ -557 +560 @@
     *fLog << "%) Evts skipped: " << str << endl;
 }
+
+// --------------------------------------------------------------------------
+//
+// If obj==fFilter set fFilter to NULL
+// Call MParcontainer::RecursiveRemove
+//
+void MTask::RecursiveRemove(TObject *obj)
+{
+    if (obj==fFilter)
+        fFilter=NULL;
+
+    if (fFilter)
+        fFilter->RecursiveRemove(obj);
+
+    MParContainer::RecursiveRemove(obj);
+}