From 88ff84f5a5eb0160443a4c1c97bfce6bb1f2bc95 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Mon, 1 Apr 2024 05:02:39 +1100
Subject: [PATCH] [windows] Improve Set window icon when in debug mode

---
 v3/pkg/application/webview_window_windows.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/v3/pkg/application/webview_window_windows.go b/v3/pkg/application/webview_window_windows.go
index d7cf6c8aa..f9ebc329a 100644
--- a/v3/pkg/application/webview_window_windows.go
+++ b/v3/pkg/application/webview_window_windows.go
@@ -271,14 +271,13 @@ func (w *windowsWebviewWindow) run() {
 	if !options.Windows.DisableIcon {
 		// App icon ID is 3
 		icon, err := NewIconFromResource(w32.GetModuleHandle(""), uint16(3))
-		if err == nil {
-			w.setIcon(icon)
-		} else {
-			// Load the icon from the application icon bytes
+		if err != nil {
 			icon, err = w32.CreateLargeHIconFromImage(globalApplication.options.Icon)
-			if err == nil {
-				w.setIcon(icon)
-			}
+		}
+		if err != nil {
+			globalApplication.Logger.Warn("Failed to load icon: %v", err)
+		} else {
+			w.setIcon(icon)
 		}
 	} else {
 		w.disableIcon()