1 files changed, 7 insertions, 7 deletions

diff --git a/src/audio.rs b/src/audio.rs
index 86c88f7..4e26263 100644
--- a/src/audio.rs
+++ b/src/audio.rs
@@ -204,6 +204,8 @@ fn audio_thread(
                                 let vol = vol.lock().map(|v| *v).unwrap_or(1.0);
 
                                 if let Ok(mut audio_data) = audio_data_clone.lock() {
+                                    let mut should_clear = false;
+
                                     if let Some(ref mut state) = *audio_data {
                                         let channels = state.channels as usize;
                                         let mut offset = 0usize;
@@ -298,16 +300,17 @@ fn audio_thread(
                                         if offset == 0 && state.sample_buffer.is_empty() {
                                             ended.store(true, Ordering::SeqCst);
                                             is_playing_clone.store(false, Ordering::SeqCst);
-                                            // Clear audio data so we don't keep triggering ended
-                                            if let Ok(mut audio_data) = audio_data_clone.lock() {
-                                                *audio_data = None;
-                                            }
+                                            should_clear = true;
                                         }
                                     } else {
                                         for sample in data.iter_mut() {
                                             *sample = 0.0;
                                         }
                                     }
+
+                                    if should_clear {
+                                        *audio_data = None;
+                                    }
                                 }
                             },
                             |err| {
@@ -319,7 +322,6 @@ fn audio_thread(
                                 if let Err(e) = stream.play() {
                                     eprintln!("Failed to start stream: {}", e);
                                     is_playing.store(false, Ordering::SeqCst);
-                                    track_ended.store(true, Ordering::SeqCst);
                                 } else {
                                     current_stream = Some(stream);
                                 }
@@ -327,14 +329,12 @@ fn audio_thread(
                             Err(e) => {
                                 eprintln!("Failed to create stream: {}", e);
                                 is_playing.store(false, Ordering::SeqCst);
-                                track_ended.store(true, Ordering::SeqCst);
                             }
                         }
                     }
                     Err(e) => {
                         eprintln!("Failed to open audio: {}", e);
                         is_playing.store(false, Ordering::SeqCst);
-                        track_ended.store(true, Ordering::SeqCst);
                     }
                 }
             }