From: Marius Vlad <marius.vlad@collabora.com>
Date: Wed, 21 Oct 2020 17:06:49 +0000 (+0300)
Subject: desktop: Group tests for checking against last remote surface
X-Git-Tag: 10.91.0~10
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=3d32d6d6daf5d703a29083b08d79449fd06ed0b3;p=src%2Fagl-compositor.git

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 <marius.vlad@collabora.com>
Change-Id: Id1f5ad9a408591a010678a53eff0f3cad2d269d9
---

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);