layout: Fix panel initialization with no weston surface

Bug-AGL: SPEC-5096, SPEC-5061
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Ib60ad86aa893d812ce4cf2babbb28b860c9b94a4

diff --git a/src/layout.c b/src/layout.c
index 2e9173a..48c478e 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -175,8 +175,7 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output,
        struct weston_view *view;
        struct weston_geometry geom;
        struct weston_coord_global pos = woutput->pos;
-       struct weston_surface *wsurface =
-               weston_desktop_surface_get_surface(panel->dsurface);
+       struct weston_surface *wsurface;
 
        if (!panel)
                return;
@@ -185,6 +184,7 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output,
        dsurface = panel->dsurface;
        view = panel->view;
        geom = weston_desktop_surface_get_geometry(dsurface);
+       wsurface = weston_desktop_surface_get_surface(panel->dsurface);
 
        weston_log("(panel) geom.width %d, geom.height %d, geom.x %d, geom.y %d\n",
                        geom.width, geom.height, geom.x, geom.y);