michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove unnecessary null checks in some places

Browse Source 
Related to https://github.com/jellyfin/jellyfin/issues/2149
This commit is contained in:
KonH 2020-10-03 22:03:23 +07:00
parent c0be770681
commit 211c9cd608
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Api/Helpers/MediaInfoHelper.cs
View File

@ -554,7 +554,7 @@ namespace Jellyfin.Api.Helpers
private long? GetMaxBitrate(long? clientMaxBitrate, User user, string ipAddress) private long? GetMaxBitrate(long? clientMaxBitrate, User user, string ipAddress)
{ {
var maxBitrate = clientMaxBitrate; var maxBitrate = clientMaxBitrate;
var remoteClientMaxBitrate = user?.RemoteClientBitrateLimit ?? 0; var remoteClientMaxBitrate = user.RemoteClientBitrateLimit ?? 0;
if (remoteClientMaxBitrate <= 0) if (remoteClientMaxBitrate <= 0)
{ {

5
Jellyfin.Api/Helpers/TranscodingJobHelper.cs
View File

@ -740,10 +740,7 @@ namespace Jellyfin.Api.Helpers
/// <param name="state">The state.</param> /// <param name="state">The state.</param>
private void OnFfMpegProcessExited(Process process, TranscodingJobDto job, StreamState state) private void OnFfMpegProcessExited(Process process, TranscodingJobDto job, StreamState state)
{ {
if (job != null) job.HasExited = true;
{
job.HasExited = true;
}
_logger.LogDebug("Disposing stream resources"); _logger.LogDebug("Disposing stream resources");
state.Dispose(); state.Dispose();

2
Jellyfin.Server.Implementations/Users/UserManager.cs
View File

@ -799,7 +799,7 @@ namespace Jellyfin.Server.Implementations.Users
private IList<IPasswordResetProvider> GetPasswordResetProviders(User user) private IList<IPasswordResetProvider> GetPasswordResetProviders(User user)
{ {
var passwordResetProviderId = user?.PasswordResetProviderId; var passwordResetProviderId = user.PasswordResetProviderId;
var providers = _passwordResetProviders.Where(i => i.IsEnabled).ToArray(); var providers = _passwordResetProviders.Where(i => i.IsEnabled).ToArray();
if (!string.IsNullOrEmpty(passwordResetProviderId)) if (!string.IsNullOrEmpty(passwordResetProviderId))