commit c93b3a24a03243067a94d2d5875f82bac00a3d8c
Author: Eugene Chornyi <[email protected]>
Date: Tue Jul 7 21:13:34 2020 +0200
Wininstaller, fix bug where previous installations, with emergency version
greater than 1, could not be seen in registry on overinstall
---
.../Win32/packaging/installer/include/init.nsh | 8 ++++++--
status.23x | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/development/Win32/packaging/installer/include/init.nsh
b/development/Win32/packaging/installer/include/init.nsh
index 4276a07..00a6d1a 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -651,13 +651,17 @@ Function .onInit
ReadRegStr $0 HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5"
"DisplayVersion"
# also check for an emergency release
${if} $0 == ""
- ReadRegStr $0 HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$51"
"DisplayVersion"
+ ${For} $7 0 20
+ ReadRegStr $0 HKLM
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5$7"
"DisplayVersion"
+ ${Next}
${endif}
${else}
ReadRegStr $0 HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5"
"DisplayVersion"
# also check for an emergency release
${if} $0 == ""
- ReadRegStr $0 HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$51"
"DisplayVersion"
+ ${For} $7 0 20
+ ReadRegStr $0 HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5$7"
"DisplayVersion"
+ ${Next}
${endif}
${endif}
${if} $0 != ""
diff --git a/status.23x b/status.23x
index 1bf9d58..e9b30fd 100644
--- a/status.23x
+++ b/status.23x
@@ -87,4 +87,5 @@ What's new
* BUILD/INSTALLATION
-
+- Wininstaller, fix bug where previous installations, with emergency version
+ greater than 1, could not be seen in registry on overinstall
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
