Merge tag 'v0.22.10'

release v0.22.10
This commit is contained in:
Max Kellermann
2021-08-06 18:21:59 +02:00
17 changed files with 177 additions and 30 deletions

View File

@@ -95,8 +95,8 @@ playlist_check_translate_song(DetachedSong &song, std::string_view base_uri,
}
#endif
if (base_uri.data() != nullptr && !uri_has_scheme(uri) &&
!PathTraitsUTF8::IsAbsolute(uri))
if (base_uri.data() != nullptr &&
!PathTraitsUTF8::IsAbsoluteOrHasScheme(uri))
song.SetURI(PathTraitsUTF8::Build(base_uri, uri));
return playlist_check_load_song(song, loader);