desktop: Insert a black surface only when the output is a remote type

And the output is not a waltham version.

Bug-AGL: SPEC-3601, SPEC-3611

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I9ce3354fe59ad5f4de691823627e3603fc4cb226

diff --git a/src/desktop.c b/src/desktop.c
index 504ad47..4caba48 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -195,10 +195,10 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
        /* check if there's a last 'remote' surface and insert a black
         * surface view if there's no background set for that output
         */
-       if (desktop_surface_check_last_remote_surfaces(output->ivi,
+       if ((desktop_surface_check_last_remote_surfaces(output->ivi,
                IVI_SURFACE_ROLE_REMOTE) ||
            desktop_surface_check_last_remote_surfaces(output->ivi,
-               IVI_SURFACE_ROLE_DESKTOP))
+               IVI_SURFACE_ROLE_DESKTOP)) && output->type == OUTPUT_REMOTE)
                if (!output->background)
                        insert_black_surface(output);