From 05b5d9da9b000cbc0b27be6402145966919e5ed7 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Wed, 21 Jun 2023 08:47:25 -0400 Subject: [PATCH] fix null handling in stylesheet logic --- Oqtane.Server/Pages/_Host.cshtml.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs index 29e1e105..be518155 100644 --- a/Oqtane.Server/Pages/_Host.cshtml.cs +++ b/Oqtane.Server/Pages/_Host.cshtml.cs @@ -172,7 +172,7 @@ namespace Oqtane.Pages page.ThemeType = site.DefaultThemeType; } var theme = site.Themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == page.ThemeType)); - if (theme != null) + if (theme?.Resources != null) { resources.AddRange(theme.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList()); } @@ -180,7 +180,7 @@ namespace Oqtane.Pages if (type != null) { var obj = Activator.CreateInstance(type) as IThemeControl; - if (obj.Resources != null) + if (obj?.Resources != null) { resources.AddRange(obj.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList()); }