LayerControl: return error if surface is not ready

Bug-AGL: SPEC-2291
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: I4cc9a2676f0108b2def2b16e9e5fa4ca9d0721ac
(cherry picked from commit c850f10572d9252f7650065d5a305ca3739fea13)

diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp
index c5c7913..5b801f7 100644 (file)
--- a/src/wm_layer_control.cpp
+++ b/src/wm_layer_control.cpp
@@ -401,8 +401,11 @@ WMError LayerControl::layoutChange(const WMAction& action)
     if(!action.client->isSourceSizeSet())
     {
         ilmSurfaceProperties sp;
-        ilm_getPropertiesOfSurface(surface, &sp);
-        if((sp.origSourceHeight != sp.sourceHeight) || (sp.origSourceWidth != sp.sourceWidth))
+        if (ILM_SUCCESS != ilm_getPropertiesOfSurface(surface, &sp))
+            return WMError::FAIL;
+
+        if  (sp.origSourceHeight != sp.sourceHeight ||
+             sp.origSourceWidth  != sp.sourceWidth)
         {
             HMI_SEQ_NOTICE(action.req_num, "set source size w:%d h%d", sp.origSourceWidth, sp.origSourceHeight);
             ilm_surfaceSetSourceRectangle(surface, 0, 0, sp.origSourceWidth, sp.origSourceHeight);