Handle 'None' uri or empty string uri in transfer command (#1439)

librespot-org · Jan 12, 2025 · 4cecb22 · 4cecb22
1 parent 7003e98
commit 4cecb22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [connect] Fix "play" command not handled if missing "offset" property
 - [discovery] Fix libmdns zerconf setup errors not propagating to the main task.
 - [metadata] `Show::trailer_uri` is now optional since it isn't always present (breaking)
+- [connect] Handle transfer of playback with empty "uri" field
 
 ### Removed
 

diff --git a/connect/src/state/context.rs b/connect/src/state/context.rs
@@ -342,7 +342,7 @@ impl ConnectState {
                 Err(StateError::InvalidTrackUri(Some(uri.clone())))?
             }
             (Some(uri), _) if !uri.is_empty() => SpotifyId::from_uri(uri)?,
-            (None, Some(gid)) if !gid.is_empty() => SpotifyId::from_raw(gid)?,
+            (_, Some(gid)) if !gid.is_empty() => SpotifyId::from_raw(gid)?,
             _ => Err(StateError::InvalidTrackUri(None))?,
         };