WinGui: Attempt to fix the installer so that users can cleanly install both the night...

diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi
index 312dc2259e901232f7163a9b10e22362cb15dd55..3fa7bc077af13c06d27bd88ca061fcc1767c1c0d 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/Installer.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi
@@ -10,7 +10,7 @@
 !define PRODUCT_NAME "HandBrake"\r
 !define PRODUCT_VERSION "1.0.0"\r
 !define PRODUCT_VERSION_NUMBER "1.0.0"\r
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"\r
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
 \r

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index a1a7368011a08a8cb385403c1b439676a1c86127..3dda8579bb0bb4942300b55dcecc2fb2b04f80f2 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -10,7 +10,7 @@
 !define PRODUCT_NAME "HandBrake"\r
 !define PRODUCT_VERSION "1.0.0"\r
 !define PRODUCT_VERSION_NUMBER "1.0.0"\r
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"\r
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
 \r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
index 65ac5dc88a5578ae31fc60937b8b308b0bd14a9d..f368e0e53e9676613634fca6bbdf3bff90a874e0 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
@@ -10,7 +10,7 @@
 !define PRODUCT_NAME "HandBrake Nightly"\r
 !define PRODUCT_VERSION "Nightly"\r
 !define PRODUCT_VERSION_NUMBER "Nightly"\r
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"\r
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
 \r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index f15141bfab42e7113734662138812fbcf52edb35..b8338a0aa3b3802bd16480da1bb11d1448acaa31 100644 (file)
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -10,7 +10,7 @@
 !define PRODUCT_NAME "HandBrake Nightly"\r
 !define PRODUCT_VERSION "Nightly"\r
 !define PRODUCT_VERSION_NUMBER "Nightly"\r
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"\r
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
 \r