From de6f553af4bf4f58ab2452e2efd591e0ec6e618c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= <fengalin@free.fr>
Date: Sat, 28 Mar 2020 16:37:30 +0100
Subject: [PATCH] Fix panic closing app when a question is asked

---
 ui/src/main_controller.rs | 3 +++
 ui/src/ui_event.rs        | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/src/main_controller.rs b/ui/src/main_controller.rs
index d36fa13..1f0cca3 100644
--- a/ui/src/main_controller.rs
+++ b/ui/src/main_controller.rs
@@ -190,6 +190,9 @@ impl MainController {
         }
         self.abort_media_event_handler();
 
+        self.export_ctrl.cancel();
+        self.split_ctrl.cancel();
+
         {
             let size = self.window.get_size();
             let paned_pos = self.playback_paned.get_position();
diff --git a/ui/src/ui_event.rs b/ui/src/ui_event.rs
index 08f138b..b8a6650 100644
--- a/ui/src/ui_event.rs
+++ b/ui/src/ui_event.rs
@@ -88,9 +88,7 @@ impl UIEventSender {
             response_sender,
         });
 
-        response_receiver
-            .await
-            .expect("UI failed to receive response")
+        response_receiver.await.unwrap_or(gtk::ResponseType::Cancel)
     }
 
     pub fn cancel_select_media(&self) {