summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-07-30 13:53:10 -0400
committerChris Michael <cp.michael@samsung.com>2015-07-30 13:53:10 -0400
commit37b767994eb4e4cab94a26764a4723cd1135e7d7 (patch)
tree31ccd63626139b0cda0689bb4714072b784b57ce
parentf86e04b14f99f6baba0ffd734b81f15634f182ef (diff)
evas-wayland-shm: If no depth is specified during reconfigure, use existing depth
Summary: This fixes a crash which Could occur if no outbuf depth was given during a call to reconfigure. @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_outbuf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index 91fa1498f2..e1ca895318 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -280,7 +280,9 @@ _evas_outbuf_reconfigure(Outbuf *ob, int x, int y, int w, int h, int rot, Outbuf
280{ 280{
281 LOGFN(__FILE__, __LINE__, __FUNCTION__); 281 LOGFN(__FILE__, __LINE__, __FUNCTION__);
282 282
283 if (depth == OUTBUF_DEPTH_INHERIT) depth = ob->depth; 283 if ((depth == OUTBUF_DEPTH_NONE) ||
284 (depth == OUTBUF_DEPTH_INHERIT))
285 depth = ob->depth;
284 286
285 if ((ob->w == w) && (ob->h == h) && 287 if ((ob->w == w) && (ob->h == h) &&
286 (ob->rotation == rot) && (ob->depth == depth) && 288 (ob->rotation == rot) && (ob->depth == depth) &&