From 6938ed4b2eba469625618655a3f59a11b6d30ddc Mon Sep 17 00:00:00 2001
From: ochibani <11yzyv86j@relay.firefox.com>
Date: Fri, 10 Jan 2025 21:20:01 +0200
Subject: [PATCH] update merge

---
 Cargo.lock    |  4 ++--
 gui/src/ui.rs | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ebe668a..dadd7f9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3893,9 +3893,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/gui/src/ui.rs b/gui/src/ui.rs
index 6c77d2a..95cff3b 100644
--- a/gui/src/ui.rs
+++ b/gui/src/ui.rs
@@ -983,6 +983,7 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
     let _follow_mouse_switch = follow_mouse_switch.clone();
     let _mouse_switch = mouse_switch.clone();
     let _play_button = play_button.clone();
+    let _record_button = record_button.clone();
     let _stop_button = stop_button.clone();
     let _video_switch = video_switch.clone();
     let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone();
@@ -1002,7 +1003,7 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
                         _follow_mouse_switch.set_sensitive(true);
                     }
                     enable_input_widgets(input_widgets.clone());
-                    record_button.show();
+                    _record_button.show();
                     show_play = false;
                     _stop_button.hide();
                     let text_buffer = TextBuffer::new(None);
@@ -1024,7 +1025,7 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
                         _follow_mouse_switch.set_sensitive(true);
                     }
                     enable_input_widgets(input_widgets.clone());
-                    record_button.show();
+                    _record_button.show();
                     show_play = false;
                     _stop_button.hide();
                     let text_buffer = TextBuffer::new(None);
@@ -1046,7 +1047,7 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
                         _follow_mouse_switch.set_sensitive(true);
                     }
                     enable_input_widgets(input_widgets.clone());
-                    record_button.show();
+                    _record_button.show();
                     show_play = false;
                     _stop_button.hide();
                     let text_buffer = TextBuffer::new(None);
@@ -1061,11 +1062,11 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
             _follow_mouse_switch.set_sensitive(true);
         }
         enable_input_widgets(input_widgets.clone());
-        record_button.show();
         _stop_button.hide();
         if show_play {
             _play_button.show();
         }
+        _record_button.show();
     });
 
     // Save tmp files
@@ -1073,7 +1074,7 @@ fn build_ui(application: &Application, error_dialog: MessageDialog, error_messag
     let _error_message = error_message.clone();
     let _play_button = play_button.clone();
     let mut _ffmpeg_record_interface = ffmpeg_record_interface.clone();
-    stop_button.connect_hide(move |_| {
+    play_button.connect_show(move |_| {
         match _ffmpeg_record_interface.borrow_mut().merge() {
             Ok(_) => {
                 _play_button.set_sensitive(true);