summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaquel Medina <raquel.medina@konsulko.com>2019-06-03 15:07:57 +0200
committerraquel medina <raquel.medina@konsulko.com>2019-06-10 19:54:32 +0000
commit1a0e32970ed7c160f531378e9c683d1ad7a7d05d (patch)
tree1542345be3b79fc930b365ee0ebcb76dcb3e1b76
parent0519827841e1844b77fe2da1324ffe1490d6c812 (diff)
LayerControl: return error if surface is not readyguppy_7.0.3guppy/7.0.37.0.3
Bug-AGL: SPEC-2291 Signed-off-by: Raquel Medina <raquel.medina@konsulko.com> Change-Id: I4cc9a2676f0108b2def2b16e9e5fa4ca9d0721ac (cherry picked from commit c850f10572d9252f7650065d5a305ca3739fea13)
-rw-r--r--src/wm_layer_control.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp
index c5c7913..5b801f7 100644
--- 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);