From cf82b203a906c9e0d879a81bf815b8e8caf38794 Mon Sep 17 00:00:00 2001
From: Ultradesu <ultradesu@hexor.cy>
Date: Tue, 16 Jun 2026 22:34:01 +0100
Subject: [PATCH] Improved auth stability

---
 Cargo.lock        | 2 +-
 src/api/auth.rs   | 7 +++++++
 src/app/mod.rs    | 3 ++-
 src/player/mod.rs | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b8d2dc0..ee34310 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1180,7 +1180,7 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
 [[package]]
 name = "furumi_tui"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "anyhow",
  "arboard",
diff --git a/src/api/auth.rs b/src/api/auth.rs
index dacae4e..a14d484 100644
--- a/src/api/auth.rs
+++ b/src/api/auth.rs
@@ -58,6 +58,13 @@ pub fn now_epoch_seconds() -> i64 {
         .unwrap_or(0)
 }
 
+pub fn now_epoch_millis() -> i64 {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|d| d.as_millis() as i64)
+        .unwrap_or(0)
+}
+
 pub fn session_path() -> Option<PathBuf> {
     crate::config::project_dirs().map(|dirs| dirs.config_dir().join("credentials.json"))
 }
diff --git a/src/app/mod.rs b/src/app/mod.rs
index 48ffb0c..eedd3ab 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -403,7 +403,7 @@ fn device_playback_state(state: &AppState) -> Option<crate::api::models::DeviceP
         shuffle: player.shuffle,
         repeat_mode: player.repeat.label().to_string(),
         volume: f64::from(player.volume) / 100.0,
-        updated_at_ms: 0,
+        updated_at_ms: auth::now_epoch_millis(),
     })
 }
 
@@ -752,6 +752,7 @@ fn resume_current_audio(state: &mut AppState, runtime: &mut Runtime) {
             position_secs,
             "reopening playback stream after a long pause"
         );
+        runtime.player.stop();
         start_current_audio(state, runtime, position_secs, false);
     } else {
         runtime.player.resume();
diff --git a/src/player/mod.rs b/src/player/mod.rs
index 761e945..ea3963b 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -252,7 +252,7 @@ fn handle(
             }
         }
         Command::Stop => {
-            if let Some(out) = output {
+            if let Some(out) = output.take() {
                 out.player.stop();
             }
             *track_loaded = false;