<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2016-03-22 15:48 GMT+01:00 Pekka Paalanen <span dir="ltr"><<a href="mailto:ppaalanen@gmail.com" target="_blank">ppaalanen@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Pekka Paalanen <<a href="mailto:pekka.paalanen@collabora.co.uk">pekka.paalanen@collabora.co.uk</a>><br>
<br>
This should not get called unless there is an ivi_shell_surface.<br>
<br>
Signed-off-by: Pekka Paalanen <<a href="mailto:pekka.paalanen@collabora.co.uk">pekka.paalanen@collabora.co.uk</a>><br>
---<br>
 ivi-shell/ivi-shell.c | 6 +++++-<br>
 1 file changed, 5 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c<br>
index 9c11f6f..d136f46 100644<br>
--- a/ivi-shell/ivi-shell.c<br>
+++ b/ivi-shell/ivi-shell.c<br>
@@ -108,7 +108,11 @@ ivi_shell_surface_configure(struct weston_surface *surface,<br>
 {<br>
        struct ivi_shell_surface *ivisurf = get_ivi_shell_surface(surface);<br>
<br>
-       if (surface->width == 0 || surface->height == 0 || ivisurf == NULL)<br>
+       assert(ivisurf);<br>
+       if (!ivisurf)<br>
+               return;<br>
+<br>
+       if (surface->width == 0 || surface->height == 0)<br>
                return;<br>
<br>
        if (ivisurf->width != surface->width ||<br>
<span class=""><font color="#888888">--<br>
2.7.3<br>
<br>
_______________________________________________<br>
wayland-devel mailing list<br>
<a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/wayland-devel" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/wayland-devel</a><br>
</font></span></blockquote></div>Looks good<br>
<span>Reviewed</span>-<span>by</span>: Eugen Friedrich <<a href="mailto:friedrix@gmail.com" target="_blank">friedrix@gmail.com</a>></div></div>