From 3101d0a7aa072803773decba582bdbc2d3b20892 Mon Sep 17 00:00:00 2001
From: Vladimir Stoilov <vladimir@safing.io>
Date: Tue, 10 Dec 2024 13:46:31 +0200
Subject: [PATCH] Fix windows installers

---
 .golangci.yml                                            | 1 -
 desktop/tauri/src-tauri/templates/files.wxs              | 2 ++
 desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh | 2 ++
 service/profile/config-update.go                         | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 12967f60..3d333669 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -24,7 +24,6 @@ linters:
     - interfacer
     - ireturn
     - lll
-    - mnd
     - musttag
     - nestif
     - nilnil
diff --git a/desktop/tauri/src-tauri/templates/files.wxs b/desktop/tauri/src-tauri/templates/files.wxs
index 8623e435..14159aa8 100644
--- a/desktop/tauri/src-tauri/templates/files.wxs
+++ b/desktop/tauri/src-tauri/templates/files.wxs
@@ -14,7 +14,9 @@
     <Component Id="BinaryFiles" Directory="INSTALLDIR" Guid="850cdd31-424d-45f5-b8f0-95df950ebd0d">
       <File Id="BinIndexJson" Source="..\..\..\..\binary\index.json" />
       <File Id="PortmasterCoreExe" Source="..\..\..\..\binary\portmaster-core.exe" />
+      <File Id="PortmasterCoreDLL" Source="..\..\..\..\binary\portmaster-core.dll" />
       <File Id="PortmasterKextSys" Source="..\..\..\..\binary\portmaster-kext.sys" />
+      <File Id="WebView2Loader" Source="..\..\..\..\binary\WebView2Loader.dll" />
       <File Id="PortmasterZip" Source="..\..\..\..\binary\portmaster.zip" />
       <File Id="AssetsZip" Source="..\..\..\..\binary\assets.zip" />
     </Component>
diff --git a/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh b/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh
index 79bc1218..5d08c799 100644
--- a/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh
+++ b/desktop/tauri/src-tauri/templates/nsis_install_hooks.nsh
@@ -6,6 +6,8 @@
   File "..\..\..\..\binary\index.json"
   File "..\..\..\..\binary\portmaster-core.exe"
   File "..\..\..\..\binary\portmaster-kext.sys"
+  File "..\..\..\..\binary\portmaster-core.dll"
+  File "..\..\..\..\binary\WebView2Loader.dll"
   File "..\..\..\..\binary\portmaster.zip"
   File "..\..\..\..\binary\assets.zip"
 
diff --git a/service/profile/config-update.go b/service/profile/config-update.go
index f3e8161c..d958e307 100644
--- a/service/profile/config-update.go
+++ b/service/profile/config-update.go
@@ -143,7 +143,7 @@ func updateGlobalConfigProfile(_ context.Context) error {
 		module.states.Add(mgr.State{
 			ID:      globalConfigProfileErrorID,
 			Name:    "Internal Settings Failure",
-			Message: fmt.Sprintf("Some global settings might not be applied correctly. You can try restarting the Portmaster to resolve this problem. Error: %s", err),
+			Message: fmt.Sprintf("Some global settings might not be applied correctly. You can try restarting the Portmaster to resolve this problem. Error: %s", lastErr),
 			Type:    mgr.StateTypeWarning,
 		})
 	}