From ddddd19e19e67fdcdd2da94ee392ab5129b0253f Mon Sep 17 00:00:00 2001 From: Shane Neuville Date: Thu, 15 Aug 2019 16:37:52 -0600 Subject: [PATCH] nonappcompat check if MDP Icon is null (#7162) fixes #6958 --- Xamarin.Forms.Platform.Android/Platform.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Xamarin.Forms.Platform.Android/Platform.cs b/Xamarin.Forms.Platform.Android/Platform.cs index fec41111f..ce4896417 100644 --- a/Xamarin.Forms.Platform.Android/Platform.cs +++ b/Xamarin.Forms.Platform.Android/Platform.cs @@ -574,7 +574,7 @@ namespace Xamarin.Forms.Platform.Android ClearMasterDetailToggle(); return; } - if (!CurrentMasterDetailPage.ShouldShowToolbarButton() || CurrentMasterDetailPage.Master.IconImageSource.IsEmpty || + if (!CurrentMasterDetailPage.ShouldShowToolbarButton() || (CurrentMasterDetailPage.Master.IconImageSource?.IsEmpty ?? true) || (MasterDetailPageController.ShouldShowSplitMode && CurrentMasterDetailPage.IsPresented)) { //clear out existing icon;