From 3d32d6d6daf5d703a29083b08d79449fd06ed0b3 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 21 Oct 2020 20:06:49 +0300 Subject: [PATCH] desktop: Group tests for checking against last remote surface Synthetic change, to group them together. Makes reading the code a bit more clearer. Bug-AGL: SPEC-3601 Signed-off-by: Marius Vlad Change-Id: Id1f5ad9a408591a010678a53eff0f3cad2d269d9 --- src/desktop.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/desktop.c b/src/desktop.c index 87ba7e1..504ad47 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -196,14 +196,12 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) * surface view if there's no background set for that output */ if (desktop_surface_check_last_remote_surfaces(output->ivi, - IVI_SURFACE_ROLE_REMOTE)) + IVI_SURFACE_ROLE_REMOTE) || + desktop_surface_check_last_remote_surfaces(output->ivi, + IVI_SURFACE_ROLE_DESKTOP)) if (!output->background) insert_black_surface(output); - if (desktop_surface_check_last_remote_surfaces(output->ivi, - IVI_SURFACE_ROLE_DESKTOP)) - if (!output->background) - insert_black_surface(output); if (weston_surface_is_mapped(wsurface)) { weston_desktop_surface_unlink_view(surface->view); -- 2.16.6