Use null propagation

Emby.Dlna/PlayTo/Device.cs

@@ -927,14 +927,11 @@ namespace Emby.Dlna.PlayTo
 
             var resElement = container.Element(UPnpNamespaces.Res);
 
-            if (resElement is not null)
+            var info = resElement?.Attribute(UPnpNamespaces.ProtocolInfo);
-            {
-                var info = resElement.Attribute(UPnpNamespaces.ProtocolInfo);
 
-                if (info is not null && !string.IsNullOrWhiteSpace(info.Value))
+            if (info is not null && !string.IsNullOrWhiteSpace(info.Value))
-                {
+            {
-                    return info.Value.Split(':');
+                return info.Value.Split(':');
-                }
             }
 
             return new string[4];

Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -3540,10 +3540,7 @@ namespace Emby.Server.Implementations.Data
                         .Append(paramName)
                         .Append("))) OR ");
 
-                    if (statement is not null)
+                    statement?.TryBind(paramName, query.PersonIds[i]);
-                    {
-                        statement.TryBind(paramName, query.PersonIds[i]);
-                    }
                 }
 
                 clauseBuilder.Length -= Or.Length;

MediaBrowser.Controller/Entities/BaseItemExtensions.cs

@@ -95,10 +95,7 @@ namespace MediaBrowser.Controller.Entities
                 }
 
                 var p = destProps.Find(x => x.Name == sourceProp.Name);
-                if (p is not null)
+                p?.SetValue(dest, v);
-                {
-                    p.SetValue(dest, v);
-                }
             }
         }
 

RSSDP/HttpRequestParser.cs

@@ -33,10 +33,7 @@ namespace Rssdp.Infrastructure
             }
             finally
             {
-                if (retVal != null)
+                retVal?.Dispose();
-                {
-                    retVal.Dispose();
-                }
             }
         }
 

RSSDP/HttpResponseParser.cs

@@ -33,10 +33,7 @@ namespace Rssdp.Infrastructure
             }
             catch
             {
-                if (retVal != null)
+                retVal?.Dispose();
-                {
-                    retVal.Dispose();
-                }
 
                 throw;
             }

RSSDP/SsdpCommunicationsServer.cs

@@ -512,22 +512,16 @@ namespace Rssdp.Infrastructure
             }
 
             var handlers = this.RequestReceived;
-            if (handlers is not null)
+            handlers?.Invoke(this, new RequestReceivedEventArgs(data, remoteEndPoint, receivedOnlocalIPAddress));
-            {
-                handlers(this, new RequestReceivedEventArgs(data, remoteEndPoint, receivedOnlocalIPAddress));
-            }
         }
 
         private void OnResponseReceived(HttpResponseMessage data, IPEndPoint endPoint, IPAddress localIPAddress)
         {
             var handlers = this.ResponseReceived;
-            if (handlers is not null)
+            handlers?.Invoke(this, new ResponseReceivedEventArgs(data, endPoint)
             {
-                handlers(this, new ResponseReceivedEventArgs(data, endPoint)
+                LocalIPAddress = localIPAddress
-                {
+            });
-                    LocalIPAddress = localIPAddress
-                });
-            }
         }
     }
 }

RSSDP/SsdpDevice.cs

@@ -337,10 +337,7 @@ namespace Rssdp
         protected virtual void OnDeviceAdded(SsdpEmbeddedDevice device)
         {
             var handlers = this.DeviceAdded;
-            if (handlers != null)
+            handlers?.Invoke(this, new DeviceEventArgs(device));
-            {
-                handlers(this, new DeviceEventArgs(device));
-            }
         }
 
         /// <summary>
@@ -352,10 +349,7 @@ namespace Rssdp
         protected virtual void OnDeviceRemoved(SsdpEmbeddedDevice device)
         {
             var handlers = this.DeviceRemoved;
-            if (handlers != null)
+            handlers?.Invoke(this, new DeviceEventArgs(device));
-            {
-                handlers(this, new DeviceEventArgs(device));
-            }
         }
     }
 }

RSSDP/SsdpDeviceLocator.cs

@@ -227,13 +227,10 @@ namespace Rssdp.Infrastructure
             }
 
             var handlers = this.DeviceAvailable;
-            if (handlers is not null)
+            handlers?.Invoke(this, new DeviceAvailableEventArgs(device, isNewDevice)
             {
-                handlers(this, new DeviceAvailableEventArgs(device, isNewDevice)
+                RemoteIPAddress = IPAddress
-                {
+            });
-                    RemoteIPAddress = IPAddress
-                });
-            }
         }
 
         /// <summary>
@@ -250,10 +247,7 @@ namespace Rssdp.Infrastructure
             }
 
             var handlers = this.DeviceUnavailable;
-            if (handlers is not null)
+            handlers?.Invoke(this, new DeviceUnavailableEventArgs(device, expired));
-            {
-                handlers(this, new DeviceUnavailableEventArgs(device, expired));
-            }
         }
 
         /// <summary>

RSSDP/SsdpDevicePublisher.cs

@@ -527,10 +527,7 @@ namespace Rssdp.Infrastructure
         {
             var timer = _RebroadcastAliveNotificationsTimer;
             _RebroadcastAliveNotificationsTimer = null;
-            if (timer is not null)
+            timer?.Dispose();
-            {
-                timer.Dispose();
-            }
         }
 
         private TimeSpan GetMinimumNonZeroCacheLifetime()
@@ -564,10 +561,7 @@ namespace Rssdp.Infrastructure
 
         private void WriteTrace(string text)
         {
-            if (LogFunction is not null)
+            LogFunction?.Invoke(text);
-            {
-                LogFunction(text);
-            }
             // System.Diagnostics.Debug.WriteLine(text, "SSDP Publisher");
         }