From 4e4391b3152e79074c84937cdc17c6d4cc6bdf2f Mon Sep 17 00:00:00 2001
From: locpham <yeunhiepanh.photo@gmail.com>
Date: Sat, 8 Aug 2026 10:12:21 +0000
Subject: [PATCH] =?UTF-8?q?FIX:=20lib.rs=20=E2=80=94=20E0597=20borrow,=20t?=
 =?UTF-8?q?ake=20child=20ra=20khoi=20lock=20truoc=20khi=20kill?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/lib.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index d88babb..0b97e4d 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -28,12 +28,16 @@ pub fn run() {
         .on_window_event(|window, event| {
             // 2. Terminate sidecar khi DAW window dong — tranh orphan process
             if let tauri::WindowEvent::Destroyed = event {
-                let state = window.state::<EngineProcess>();
-                if let Ok(mut lock) = state.0.lock() {
-                    if let Some(child) = lock.take() {
-                        let _ = child.kill();
-                        println!("daw_engine sidecar terminated.");
-                    }
+                // Lay child ra khoi lock, guard drop ngay tai day (trach E0597)
+                let child = window
+                    .state::<EngineProcess>()
+                    .0
+                    .lock()
+                    .ok()
+                    .and_then(|mut lock| lock.take());
+                if let Some(child) = child {
+                    let _ = child.kill();
+                    println!("daw_engine sidecar terminated.");
                 }
             }
         })