Make userId truly optional in UniversalAudioController Original-merge: af877063795469ac3d94d356b2787e296606f571 Merged-by: Bond-009 <bond.009@outlook.com> Backported-by: Joshua M. Boniface <joshua@boniface.me>
@@ -111,7 +111,13 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool enableRedirection = true)
{
var deviceProfile = GetDeviceProfile(container, transcodingContainer, audioCodec, transcodingProtocol, breakOnNonKeyFrames, transcodingAudioChannels, maxAudioSampleRate, maxAudioBitDepth, maxAudioChannels);
- (await _authorizationContext.GetAuthorizationInfo(Request).ConfigureAwait(false)).DeviceId = deviceId;
+ var authorizationInfo = await _authorizationContext.GetAuthorizationInfo(Request).ConfigureAwait(false);
+ authorizationInfo.DeviceId = deviceId;
+
+ if (!userId.HasValue || userId.Value.Equals(Guid.Empty))
+ {
+ userId = authorizationInfo.UserId;
+ }
var authInfo = await _authorizationContext.GetAuthorizationInfo(Request).ConfigureAwait(false);