Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 15:20:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4265 from KonH/remove_unnecessary_null_checks

Browse source 
Remove unnecessary null checks in some places
This commit is contained in:
dkanada 2020-10-06 13:04:54 +09:00 committed by GitHub
parent e11a2d4397 211c9cd608
commit 3a238de35e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -801,7 +801,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))