Index: /trunk/MagicSoft/Mars/mbase/MStatusArray.cc
===================================================================
--- /trunk/MagicSoft/Mars/mbase/MStatusArray.cc	(revision 4980)
+++ /trunk/MagicSoft/Mars/mbase/MStatusArray.cc	(revision 4981)
@@ -61,10 +61,4 @@
     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,4 +129,14 @@
 }
 
+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
 {