From 2f98df87a0526486aa5d252e76cb9b7279dc182a Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Wed, 8 Nov 2023 18:36:23 +0100
Subject: [PATCH] Setup/Installer: fix Elwig.ico/.png path

---
 Installer/Package.wxs | 2 +-
 Setup/Bundle.wxs      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Installer/Package.wxs b/Installer/Package.wxs
index 4305f0b..6768d5b 100644
--- a/Installer/Package.wxs
+++ b/Installer/Package.wxs
@@ -3,7 +3,7 @@
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" AllowSameVersionUpgrades="no" />
 	<MediaTemplate EmbedCab="true" MaximumUncompressedMediaSize="10"/>
 
-	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\Resourcs\Images\Elwig.ico"/>
+	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico"/>
 	<Property Id="ARPPRODUCTICON" Value="icon.ico"/>
 
 	<Feature Id="Main">
diff --git a/Setup/Bundle.wxs b/Setup/Bundle.wxs
index 46d776d..211b1ea 100644
--- a/Setup/Bundle.wxs
+++ b/Setup/Bundle.wxs
@@ -1,7 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
   <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7" IconSourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico" >
 	<BootstrapperApplication>
-      <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\elwig.png" SuppressOptionsUI="yes" ShowVersion="yes" />   
+      <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.png" SuppressOptionsUI="yes" ShowVersion="yes" />
 	</BootstrapperApplication>
 	  
     <util:RegistrySearch Id="VCredistx86" Variable="VCredistx86" Result="exists" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\VC,redist.x86,x86,14.36,bundle" />
@@ -9,7 +9,7 @@
     <util:RegistrySearch Id="Webview2User" Variable="Webview2User" Result="exists" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" />
 
     <Chain>
-      <ExePackage Id="VCredistx86Installer" DisplayName="VC Redist x86 installer" Name="VC_redist.x86.exe" Cache="remove" Compressed="yes" PerMachine="yes" 
+      <ExePackage Id="VCredistx86Installer" DisplayName="VC Redist x86 installer" Name="VC_redist.x86.exe" Cache="remove" Compressed="yes" PerMachine="yes"
 				  Permanent="yes" Vital="yes" SourceFile="$(TargetDir)VC_redist.x86.exe" InstallArguments="/install /passive /norestart" DetectCondition="VCredistx86">
       </ExePackage>