Fix: Fixed crash when creating taskbar progress (#14190)

yaira2 · hishitetsu · web-flow · commit f5e907f0a155 · 2023-12-09T19:30:21.000-05:00
Co-authored-by: hishitetsu &lt;66369541+hishitetsu@users.noreply.github.com&gt;
diff --git a/src/Files.App/Utils/Shell/Win32API.cs b/src/Files.App/Utils/Shell/Win32API.cs
@@ -568,18 +568,17 @@ public static Task<bool> MountVhdDisk(string vhdPath)
 
 		public static Shell32.ITaskbarList4? CreateTaskbarObject()
 		{
-			var taskbar2 = new Shell32.ITaskbarList2();
 			try
 			{
+				var taskbar2 = new Shell32.ITaskbarList2();
 				taskbar2.HrInit();
+				return taskbar2 as Shell32.ITaskbarList4;
 			}
-			catch (NotImplementedException)
+			catch (Exception)
 			{
 				// explorer.exe is not running as a shell
 				return null;
 			}
-
-			return taskbar2 as Shell32.ITaskbarList4;
 		}
 
 		private static Bitmap GetAlphaBitmapFromBitmapData(BitmapData bmpData)

Original file line number	Diff line number	Diff line change
`@@ -568,18 +568,17 @@ public static Task<bool> MountVhdDisk(string vhdPath)`
`568`	`568`
`569`	`569`	`public static Shell32.ITaskbarList4? CreateTaskbarObject()`
`570`	`570`	`{`
`571`		`- var taskbar2 = new Shell32.ITaskbarList2();`
`572`	`571`	`try`
`573`	`572`	`{`
	`573`	`+ var taskbar2 = new Shell32.ITaskbarList2();`
`574`	`574`	`taskbar2.HrInit();`
	`575`	`+ return taskbar2 as Shell32.ITaskbarList4;`
`575`	`576`	`}`
`576`		`- catch (NotImplementedException)`
	`577`	`+ catch (Exception)`
`577`	`578`	`{`
`578`	`579`	`// explorer.exe is not running as a shell`
`579`	`580`	`return null;`
`580`	`581`	`}`
`581`		`-`
`582`		`- return taskbar2 as Shell32.ITaskbarList4;`
`583`	`582`	`}`
`584`	`583`
`585`	`584`	`private static Bitmap GetAlphaBitmapFromBitmapData(BitmapData bmpData)`