Check if override presentation attribute actually returns a value

KMY520 · May 30, 2017 · 2f9e627 · 2f9e627
1 parent d2c0856
commit 2f9e627
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/MvvmCross/iOS/iOS/Views/Presenters/MvxIosViewPresenter.cs b/MvvmCross/iOS/iOS/Views/Presenters/MvxIosViewPresenter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using MvvmCross.Core.ViewModels;
@@ -385,7 +385,10 @@ protected MvxBasePresentationAttribute GetPresentationAttributes(UIViewControlle
         {
             if (viewController is IMvxOverridePresentationAttribute vc)
             {
-                return vc.OverridePresentationAttribute();
+                var presentationAttribute = vc.OverridePresentationAttribute();
+
+                if (presentationAttribute != null)
+                    return presentationAttribute;
             }
 
             var attribute = viewController.GetType().GetCustomAttributes(typeof(MvxBasePresentationAttribute), true).FirstOrDefault() as MvxBasePresentationAttribute;