From ee63d81a5753e54514d26342aadde14de9891e34 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <hausmann@gmail.com>
Date: Mon, 19 Feb 2024 10:23:54 +0100
Subject: [PATCH] Fix panic when wayland display connection breaks

Instead, terminate the thread and consider the clipboard dead. The
application can now gracefully deal with the situation.

Closes: #52
---
 examples/clipboard.rs | 4 +---
 src/mime.rs           | 6 +++---
 src/worker.rs         | 4 +---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/examples/clipboard.rs b/examples/clipboard.rs
index 15fc026..583e99d 100644
--- a/examples/clipboard.rs
+++ b/examples/clipboard.rs
@@ -2,8 +2,6 @@
 // application. For more details on what is going on, consult the
 // `smithay-client-toolkit` examples.
 
-use std::convert::TryInto;
-
 use sctk::compositor::{CompositorHandler, CompositorState};
 use sctk::output::{OutputHandler, OutputState};
 use sctk::reexports::calloop::{EventLoop, LoopHandle};
@@ -23,7 +21,7 @@ use sctk::{
     delegate_compositor, delegate_keyboard, delegate_output, delegate_registry, delegate_seat,
     delegate_shm, delegate_xdg_shell, delegate_xdg_window, registry_handlers,
 };
-use smithay_clipboard::{self, Clipboard};
+use smithay_clipboard::Clipboard;
 
 const MIN_DIM_SIZE: usize = 256;
 
diff --git a/src/mime.rs b/src/mime.rs
index 7761d6c..a934972 100644
--- a/src/mime.rs
+++ b/src/mime.rs
@@ -42,9 +42,9 @@ impl MimeType {
     }
 }
 
-impl ToString for MimeType {
-    fn to_string(&self) -> String {
-        String::from(ALLOWED_MIME_TYPES[*self as usize])
+impl std::fmt::Display for MimeType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", ALLOWED_MIME_TYPES[*self as usize])
     }
 }
 
diff --git a/src/worker.rs b/src/worker.rs
index 4b0349f..49885ca 100644
--- a/src/worker.rs
+++ b/src/worker.rs
@@ -95,9 +95,7 @@ fn worker_impl(
     WaylandSource::new(connection, event_queue).insert(loop_handle).unwrap();
 
     loop {
-        event_loop.dispatch(None, &mut state).unwrap();
-
-        if state.exit {
+        if event_loop.dispatch(None, &mut state).is_err() || state.exit {
             break;
         }
     }