Merge pull request #1945 from AmrAlSayed0/patch-1

Fixes NRE when app put to sleep when MainPage isn't set
PrismLibrary · Nov 7, 2019 · 543f539 · 543f539
2 parents 0597260 + c9a11d9
commit 543f539
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/Source/Xamarin/Prism.Forms/PrismApplicationBase.cs b/Source/Xamarin/Prism.Forms/PrismApplicationBase.cs
@@ -230,14 +230,20 @@ protected virtual void InitializeModules()
 
         protected override void OnResume()
         {
-            var page = PageUtilities.GetCurrentPage(MainPage);
-            PageUtilities.InvokeViewAndViewModelAction<IApplicationLifecycleAware>(page, x => x.OnResume());
+            if (MainPage != null)
+            {
+                var page = PageUtilities.GetCurrentPage(MainPage);
+                PageUtilities.InvokeViewAndViewModelAction<IApplicationLifecycleAware>(page, x => x.OnResume());
+            }
         }
 
         protected override void OnSleep()
         {
-            var page = PageUtilities.GetCurrentPage(MainPage);
-            PageUtilities.InvokeViewAndViewModelAction<IApplicationLifecycleAware>(page, x => x.OnSleep());
+            if (MainPage != null)
+            {
+                var page = PageUtilities.GetCurrentPage(MainPage);
+                PageUtilities.InvokeViewAndViewModelAction<IApplicationLifecycleAware>(page, x => x.OnSleep());
+            }
         }
 
         private void PrismApplicationBase_ModalPopping(object sender, ModalPoppingEventArgs e)