Changeset 4981 for trunk/MagicSoft/Mars/mbase/MStatusArray.cc

Timestamp:

09/13/04 14:43:20 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -61 +61 @@
     delete d;
     return 0;
-}
-
-TCanvas *MStatusArray::FindCanvas(const char *name) const
-{
-    TObject *o = TObjArray::FindObject(name);
-    return o->InheritsFrom(TCanvas::Class()) ? (TCanvas*)o : 0;
 }
 
@@ -135 +129 @@
 }
 
+TCanvas *MStatusArray::FindCanvas(const char *name) const
+{
+    TObject *o = TObjArray::FindObject(name);
+    if (!o)
+        return 0;
+
+    return o->InheritsFrom(TCanvas::Class()) ? (TCanvas*)o : 0;
+}
+
+
 TObject *MStatusArray::FindObjectInCanvas(const char *object, const char *base, const char *canvas) const
 {