From: Juyeon Lee <juyeonne.lee@samsung.com>
Date: Fri, 17 Jun 2016 10:53:52 +0000 (+0900)
Subject: plane ec never be NULL when origin is also NULL
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fsandbox%2Fjuyeonlee%2Fdevel;p=platform%2Fupstream%2Fenlightenment.git

plane ec never be NULL when origin is also NULL

Change-Id: I393521567466976fc1e474d07cf15efe5deb7097
---

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 4a922f5b8f..4d177dd02c 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -522,7 +522,11 @@ _hwc_cancel(E_Output * eout)
 
    EINA_LIST_FOREACH_SAFE(eout->planes, l, ll, ep)
      {
-        if (ep->ec) e_client_redirected_set(ep->ec, 1);
+        if (ep->ec)
+          {
+             e_client_redirected_set(ep->ec, 1);
+             e_plane_ec_set(ep, NULL);
+          }
         e_plane_ec_prepare_set(ep, NULL);
         e_plane_ec_set(ep, NULL);
         if(e_plane_is_primary(ep)) e_plane_fb_set(ep, EINA_TRUE);
diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c
index cff0e77812..71031677a1 100644
--- a/src/bin/e_plane.c
+++ b/src/bin/e_plane.c
@@ -1293,6 +1293,8 @@ e_plane_ec_set(E_Plane *plane, E_Client *ec)
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(plane, EINA_FALSE);
 
+   if (!ec &&  !plane->ec) return EINA_FALSE;
+
    renderer = plane->renderer;
    einfo = (Evas_Engine_Info_GL_Drm *)evas_engine_info_get(e_comp->evas);