Merge pull request #662 from Baseflow/fix/timed_metadata_nullcheck

martijn00 · web-flow · commit c47f0134276e · 2020-01-09T14:17:57.000+01:00
Add nullcheck on current
diff --git a/MediaManager/Platforms/Apple/Player/AppleMediaPlayer.cs b/MediaManager/Platforms/Apple/Player/AppleMediaPlayer.cs
@@ -89,7 +89,7 @@ protected virtual void PresentationSizeChanged(NSObservedChange obj)
 
         protected virtual void TimedMetaDataChanged(NSObservedChange obj)
         {
-            if (!string.IsNullOrEmpty(MediaManager.Queue.Current.DisplayTitle) && !string.IsNullOrEmpty(MediaManager.Queue.Current.DisplaySubtitle))
+            if (!string.IsNullOrEmpty(MediaManager.Queue.Current?.DisplayTitle) && !string.IsNullOrEmpty(MediaManager.Queue.Current?.DisplaySubtitle))
                 return;
 
             if (obj.NewValue is NSArray array && array.Count > 0)

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected virtual void PresentationSizeChanged(NSObservedChange obj)`
`89`	`89`
`90`	`90`	`protected virtual void TimedMetaDataChanged(NSObservedChange obj)`
`91`	`91`	`{`
`92`		`- if (!string.IsNullOrEmpty(MediaManager.Queue.Current.DisplayTitle) && !string.IsNullOrEmpty(MediaManager.Queue.Current.DisplaySubtitle))`
	`92`	`+ if (!string.IsNullOrEmpty(MediaManager.Queue.Current?.DisplayTitle) && !string.IsNullOrEmpty(MediaManager.Queue.Current?.DisplaySubtitle))`
`93`	`93`	`return;`
`94`	`94`
`95`	`95`	`if (obj.NewValue is NSArray array && array.Count > 0)`