From 7328958dde6130e0de8d26baae7bcb0e62dd5940 Mon Sep 17 00:00:00 2001
From: Ferdinand Schober <ferdinand.schober@fau.de>
Date: Fri, 12 Jul 2024 11:41:32 +0200
Subject: [PATCH] fix session not actually closed

---
 input-emulation/src/libei.rs | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/input-emulation/src/libei.rs b/input-emulation/src/libei.rs
index 7cfee34..afea9fe 100644
--- a/input-emulation/src/libei.rs
+++ b/input-emulation/src/libei.rs
@@ -105,7 +105,7 @@ async fn get_ei_fd<'a>() -> Result<(RemoteDesktop<'a>, Session<'a>, OwnedFd), as
 
 impl<'a> LibeiEmulation<'a> {
     pub async fn new() -> Result<Self, LibeiEmulationCreationError> {
-        let (remote_desktop, session, eifd) = get_ei_fd().await?;
+        let (_remote_desktop, session, eifd) = get_ei_fd().await?;
         let stream = UnixStream::from(eifd);
         stream.set_nonblocking(true)?;
         let context = ei::Context::new(stream)?;
@@ -139,7 +139,7 @@ impl<'a> LibeiEmulation<'a> {
             error,
             libei_error,
             serial,
-            remote_desktop,
+            _remote_desktop,
             session,
         })
     }
@@ -252,20 +252,7 @@ impl<'a> InputEmulation for LibeiEmulation<'a> {
     async fn destroy(&mut self, _: EmulationHandle) {}
 
     async fn terminate(&mut self) {
-        if let Err(e) = self.session.close().await {
-            log::warn!("session.close(): {e}");
-        };
-        match self
-            .session
-            .receive_closed()
-            .await
-            .expect("could not receive closed")
-            .next()
-            .await
-        {
-            Some(c) => log::info!("session closed: {c:?}"),
-            None => log::warn!("session.receive_closed(): Unexpected EOF"),
-        };
+        let _ = self.session.close().await;
         self.ei_task.abort();
     }
 }