Merge pull request #949 from bijington/issue-910-object-disposed-exce…

…ption Added locking around the disposal of the observer
jamesmontemagno · Sep 22, 2022 · cacba4e · cacba4e
2 parents d87341a + f532b9f
commit cacba4e
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/src/Media.Plugin/iOS/MediaPickerDelegate.cs b/src/Media.Plugin/iOS/MediaPickerDelegate.cs
@@ -154,6 +154,7 @@ public void DisplayPopover(bool hideFirst = false)
 
         UIDeviceOrientation? orientation;
         NSObject observer;
+        readonly object observerDisposeLock = new object();
         readonly UIViewController viewController;
         readonly UIImagePickerControllerSourceType source;
         TaskCompletionSource<List<MediaFile>> tcs = new TaskCompletionSource<List<MediaFile>>();
@@ -203,18 +204,24 @@ void RemoveOrientationChangeObserverAndNotifications()
 
             if (observer != null)
             {
-                try
-                {
-                    NSNotificationCenter.DefaultCenter.RemoveObserver(observer);
-                }
-                catch (Exception ex)
+                lock (observerDisposeLock)
                 {
-                    Debug.WriteLine(ex);
-                }
+                    if (observer != null)
+                    {
+                        try
+                        {
+                            NSNotificationCenter.DefaultCenter.RemoveObserver(observer);
+                        }
+                        catch (Exception ex)
+                        {
+                            Debug.WriteLine(ex);
+                        }
 
+                        observer.Dispose();
+                        observer = null;
+                    }
+                }
             }
-            observer?.Dispose();
-            observer = null;
         }
 
         void DidRotate(NSNotification notice)