From d98fa6dd7af6a6f98575ebb8c83210dbca19e441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 21 Jul 2021 18:39:24 +0400
Subject: [PATCH] qemu-display-listener: simplify ignored signals handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 qemu-display-listener/src/console.rs | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/qemu-display-listener/src/console.rs b/qemu-display-listener/src/console.rs
index 7c2dca8..de05ef0 100644
--- a/qemu-display-listener/src/console.rs
+++ b/qemu-display-listener/src/console.rs
@@ -80,26 +80,22 @@ impl Console {
     pub async fn dispatch_signals(&self) -> Result<()> {
         use futures_util::{future::FutureExt, select};
 
-        select!(
+        if let Some(msg) = select!(
             msg = self.proxy.next_signal().fuse() => {
-                if let Some(msg) = msg? {
-                    log::debug!("Ignoring {:?}", msg);
-                }
-                Ok(())
+                msg?
             },
             msg = self.keyboard.next_signal().fuse() => {
-                if let Some(msg) = msg? {
-                    log::debug!("Ignoring {:?}", msg);
-                }
-                Ok(())
+                msg?
             },
             msg = self.mouse.next_signal().fuse() => {
-                if let Some(msg) = msg? {
-                    log::debug!("Ignoring {:?}", msg);
-                }
-                Ok(())
+                msg?
             }
-        )
+        ) {
+            if msg.primary_header().msg_type() == zbus::MessageType::Signal {
+                log::debug!("Ignoring {:?}", msg);
+            }
+        }
+        Ok(())
     }
 
     pub async fn label(&self) -> Result<String> {