From da19788df14fb46ef2343d736228b734ce1ffdf0 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Tue, 29 Nov 2022 02:06:11 +0800 Subject: [PATCH] Fix potential null reference --- Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs index 1d292cbab..33c469acb 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs @@ -32,7 +32,6 @@ namespace Flow.Launcher.Plugin.Program.Programs public Application[] Apps { get; set; } = Array.Empty(); - //public PackageVersion Version { get; set; } public UWP(Package package) { @@ -99,7 +98,7 @@ namespace Flow.Launcher.Plugin.Program.Programs app.CanRunElevated = packageCanElevate || Application.IfAppCanRunElevated(appNode, namespaceManager); var visualElement = appNode.SelectSingleNode($"//*[name()='uap:VisualElements']", namespaceManager); - var logoUri = visualElement.Attributes[logoName]?.Value; + var logoUri = visualElement?.Attributes[logoName]?.Value; app.LogoPath = app.LogoPathFromUri(logoUri); } } @@ -110,7 +109,6 @@ namespace Flow.Launcher.Plugin.Program.Programs "|Unexpected exception occurs when trying to construct a Application from package" + $"{FullName} from location {Location}", e); } - } private XmlDocument GetManifestXml() @@ -635,7 +633,7 @@ namespace Flow.Launcher.Plugin.Program.Programs var logoNamePrefix = Path.GetFileNameWithoutExtension(uri); // e.g Square44x44 var logoDir = Path.GetDirectoryName(path); // e.g ..\..\Assets - if (String.IsNullOrEmpty(logoNamePrefix) || String.IsNullOrEmpty(logoDir) || !Directory.Exists(logoDir)) + if (String.IsNullOrEmpty(logoNamePrefix) || !Directory.Exists(logoDir)) { // Known issue: Edge always triggers it since logo is not at uri ProgramLogger.LogException($"|UWP|LogoPathFromUri|{Location}" +