Merge pull request #105 from jvyden/linux-icon-fix

jvyden · web-flow · commit e5f2e8dbc2bd · 2025-07-02T16:03:05.000-04:00
Load PNG as fallback if ico fails
diff --git a/Refresher/Refresher.csproj b/Refresher/Refresher.csproj
@@ -50,11 +50,15 @@
       <PackageReference Condition="!$(IsWindows) And !$(IsOSX)" Include="Eto.Platform.Gtk" Version="2.9.0" />
       <PackageReference Condition="$(IsOSX)" Include="Eto.Platform.Mac64" Version="2.9.0" />
       <PackageReference Condition="$(IsWindows)" Include="Eto.Platform.Wpf" Version="2.9.0" />
-      <EmbeddedResource Include="Resources\refresher.ico" LogicalName="refresher.ico" />
       <PackageReference Include="Sentry" Version="4.4.0" />
-      <Content Include="Resources/refresher.icns" Link="refresher.icns" Condition="$(IsOSX)" />
       <PackageReference Include="Velopack" Version="0.0.1298" />
     </ItemGroup>
+    
+    <ItemGroup>
+        <EmbeddedResource Include="Resources\refresher.ico" LogicalName="refresher.ico" />
+        <EmbeddedResource Include="Resources\refresher.png" LogicalName="refresher.png" />
+        <Content Include="Resources/refresher.icns" Link="refresher.icns" Condition="$(IsOSX)" />
+    </ItemGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\Refresher.Core\Refresher.Core.csproj" />
diff --git a/Refresher/Resources/refresher.png b/Refresher/Resources/refresher.png
diff --git a/Refresher/UI/RefresherForm.cs b/Refresher/UI/RefresherForm.cs
@@ -22,10 +22,20 @@ protected RefresherForm(string subtitle, Size size, bool padBottom = true)
         {
             this.Icon = Icon.FromResource("refresher.ico");
         }
-        catch (Exception ex)
+        catch(Exception ex)
         {
-            // Not very important, so this should just be a warning, not an error
+            // Not very important, so these should just be warnings, not errors
             State.Logger.LogWarning(LogType.RefresherForm, $"Unhandled exception while loading refresher.ico in {this.GetType()}: {ex}");
+            
+            // attempt to fall back to png icon
+            try
+            {
+                this.Icon = Icon.FromResource("refresher.png");
+            }
+            catch (Exception ex2)
+            {
+                State.Logger.LogWarning(LogType.RefresherForm, $"Unhandled exception while loading refresher.png in {this.GetType()}: {ex2}");
+            }
         }
         
         if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,20 @@ protected RefresherForm(string subtitle, Size size, bool padBottom = true)`
`22`	`22`	`{`
`23`	`23`	`this.Icon = Icon.FromResource("refresher.ico");`
`24`	`24`	`}`
`25`		`- catch (Exception ex)`
	`25`	`+ catch(Exception ex)`
`26`	`26`	`{`
`27`		`- // Not very important, so this should just be a warning, not an error`
	`27`	`+ // Not very important, so these should just be warnings, not errors`
`28`	`28`	`State.Logger.LogWarning(LogType.RefresherForm, $"Unhandled exception while loading refresher.ico in {this.GetType()}: {ex}");`
	`29`	`+`
	`30`	`+ // attempt to fall back to png icon`
	`31`	`+ try`
	`32`	`+ {`
	`33`	`+ this.Icon = Icon.FromResource("refresher.png");`
	`34`	`+ }`
	`35`	`+ catch (Exception ex2)`
	`36`	`+ {`
	`37`	`+ State.Logger.LogWarning(LogType.RefresherForm, $"Unhandled exception while loading refresher.png in {this.GetType()}: {ex2}");`
	`38`	`+ }`
`29`	`39`	`}`
`30`	`40`
`31`	`41`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`