summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-08-24 19:28:51 +0200
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-09-19 10:34:22 +0200
commit525b6bb1d9cca01b100f8aedb533f3ffda190437 (patch)
treeaf570fcabd8f95da479873d80de919c304d33f37
parent425c98289df3d06b1bf4ad305f5ffce02a70098d (diff)
evas_object_main: fallback to other usage instead of returning NULL
Even if a object is on deleting or doesnt have a layer, it still can be found in a higher hirachy.
-rw-r--r--src/lib/evas/canvas/evas_object_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 88261edd67..d298efb478 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2180,11 +2180,12 @@ _efl_canvas_object_efl_object_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_
2180{ 2180{
2181 if (klass == EVAS_CANVAS_CLASS) 2181 if (klass == EVAS_CANVAS_CLASS)
2182 { 2182 {
2183 if ((obj->delete_me) || (!obj->layer)) return NULL; 2183 if ((obj->delete_me) || (!obj->layer)) goto fallback;
2184 return obj->layer->evas->evas; 2184 return obj->layer->evas->evas;
2185 } 2185 }
2186 else if (klass == EFL_LOOP_CLASS) 2186 else if (klass == EFL_LOOP_CLASS)
2187 return ecore_main_loop_get(); 2187 return ecore_main_loop_get();
2188fallback:
2188 return efl_provider_find(efl_super(eo_obj, MY_CLASS), klass); 2189 return efl_provider_find(efl_super(eo_obj, MY_CLASS), klass);
2189} 2190}
2190 2191