Fix panic closing app when a question is asked

fengalin · Mar 28, 2020 · de6f553 · de6f553
1 parent bc916ba
commit de6f553
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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) {