Merge pull request #844 from janwiebe-jump/hotfix/issue-#841-nserror

Avoid creating an NSError
Baseflow · Nov 23, 2021 · 7e84a4a · 7e84a4a
2 parents cbb1b0a + a12b940
commit 7e84a4a
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/MediaManager/Platforms/Apple/Player/AppleMediaPlayer.cs b/MediaManager/Platforms/Apple/Player/AppleMediaPlayer.cs
@@ -166,9 +166,22 @@ protected virtual void TimeControlStatusChanged(NSObservedChange obj)
 
         protected virtual void DidErrorOcurred(NSNotification obj)
         {
-            //TODO: Error should not be null after this or it will crash.
-            var error = Player?.CurrentItem?.Error ?? new NSError();
-            MediaManager.OnMediaItemFailed(this, new MediaItemFailedEventArgs(MediaManager.Queue?.Current, new NSErrorException(error), error?.LocalizedDescription));
+            Exception exception = null;
+            string message = null;
+
+            var error = Player?.CurrentItem?.Error;
+            if(error != null)
+            {
+                exception = new NSErrorException(error);
+                message = error.LocalizedDescription;
+            }
+            else
+            {
+                message = obj?.ToString() ?? "MediaItem failed with unknown reason";
+                exception = new ApplicationException(message);
+            }            
+
+            MediaManager.OnMediaItemFailed(this, new MediaItemFailedEventArgs(MediaManager.Queue?.Current, exception, message));
         }
 
         protected virtual async void DidFinishPlaying(NSNotification obj)