Handle Assembly being null

andrewleader · andrewleader · commit f3907e245dd8 · 2021-03-18T14:53:35.000-07:00
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Win32AppInfo.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Win32AppInfo.cs
@@ -126,7 +126,7 @@ private static string HashAppId(string appId)
         private static string GetDisplayNameFromCurrentProcess(Process process)
         {
             // If AssemblyTitle is set, use that
-            var assemblyTitleAttr = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyTitleAttribute>();
+            var assemblyTitleAttr = Assembly.GetEntryAssembly()?.GetCustomAttribute<AssemblyTitleAttribute>();
             if (assemblyTitleAttr != null)
             {
                 return assemblyTitleAttr.Title;

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private static string HashAppId(string appId)`
`126`	`126`	`private static string GetDisplayNameFromCurrentProcess(Process process)`
`127`	`127`	`{`
`128`	`128`	`// If AssemblyTitle is set, use that`
`129`		`- var assemblyTitleAttr = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyTitleAttribute>();`
	`129`	`+ var assemblyTitleAttr = Assembly.GetEntryAssembly()?.GetCustomAttribute<AssemblyTitleAttribute>();`
`130`	`130`	`if (assemblyTitleAttr != null)`
`131`	`131`	`{`
`132`	`132`	`return assemblyTitleAttr.Title;`