From f887320df35e44b56e437355ee0ff05507a83173 Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucasfernandesnog@gmail.com>
Date: Sat, 5 Dec 2020 22:42:27 -0300
Subject: [PATCH] fix(template) default windows icon id should be 32512, fixes
 #1099 (#1107)

---
 .changes/icon.md                                    | 6 ++++++
 cli/tauri.js/templates/src-tauri/src/build.rs       | 2 +-
 tauri/examples/communication/src-tauri/src/build.rs | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .changes/icon.md

diff --git a/.changes/icon.md b/.changes/icon.md
new file mode 100644
index 000000000..c167071af
--- /dev/null
+++ b/.changes/icon.md
@@ -0,0 +1,6 @@
+---
+"tauri.js": patch
+---
+
+Update the tauri template to properly set the app icon id on Windows so the webview can load the executable icon.
+To use it on old projects, update your `src-tauri/src/build.rs` file, replacing `res.set_icon("icons/icon.ico");` with `res.set_icon_with_id("icons/icon.ico", "32512");`.
diff --git a/cli/tauri.js/templates/src-tauri/src/build.rs b/cli/tauri.js/templates/src-tauri/src/build.rs
index 34fe92b12..83fb8f4d6 100644
--- a/cli/tauri.js/templates/src-tauri/src/build.rs
+++ b/cli/tauri.js/templates/src-tauri/src/build.rs
@@ -5,7 +5,7 @@ extern crate winres;
 fn main() {
   if std::path::Path::new("icons/icon.ico").exists() {
     let mut res = winres::WindowsResource::new();
-    res.set_icon("icons/icon.ico");
+    res.set_icon_with_id("icons/icon.ico", "32512");
     res.compile().expect("Unable to find visual studio tools");
   } else {
     panic!("No Icon.ico found. Please add one or check the path");
diff --git a/tauri/examples/communication/src-tauri/src/build.rs b/tauri/examples/communication/src-tauri/src/build.rs
index 34fe92b12..83fb8f4d6 100644
--- a/tauri/examples/communication/src-tauri/src/build.rs
+++ b/tauri/examples/communication/src-tauri/src/build.rs
@@ -5,7 +5,7 @@ extern crate winres;
 fn main() {
   if std::path::Path::new("icons/icon.ico").exists() {
     let mut res = winres::WindowsResource::new();
-    res.set_icon("icons/icon.ico");
+    res.set_icon_with_id("icons/icon.ico", "32512");
     res.compile().expect("Unable to find visual studio tools");
   } else {
     panic!("No Icon.ico found. Please add one or check the path");