Check for null MainView (xamarin#803)

Mrnikbobjeff · Aug 28, 2019 · e39ce55 · e39ce55
1 parent c7fa246
commit e39ce55
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Xamarin.Essentials/MainThread/MainThread.uwp.cs b/Xamarin.Essentials/MainThread/MainThread.uwp.cs
@@ -13,7 +13,7 @@ static bool PlatformIsMainThread
                 // if there is no main window, then this is either a service
                 // or the UI is not yet constructed, so the main thread is the
                 // current thread
-                if (CoreApplication.MainView.CoreWindow == null)
+                if (CoreApplication.MainView?.CoreWindow == null)
                     return true;
 
                 return CoreApplication.MainView.CoreWindow.Dispatcher?.HasThreadAccess ?? false;
@@ -22,7 +22,7 @@ static bool PlatformIsMainThread
 
         static void PlatformBeginInvokeOnMainThread(Action action)
         {
-            var dispatcher = CoreApplication.MainView.CoreWindow?.Dispatcher;
+            var dispatcher = CoreApplication.MainView?.CoreWindow?.Dispatcher;
 
             if (dispatcher == null)
                 throw new InvalidOperationException("Unable to find main thread.");