From: Eugene Chornyi <yu_jin@lyx.org>
Date: Tue, 7 Jul 2020 19:13:34 +0000 (+0200)
Subject: Wininstaller, fix bug where previous installations, with emergency version greater... 
X-Git-Tag: 2.3.6~75
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c93b3a24a03243067a94d2d5875f82bac00a3d8c;p=features.git

Wininstaller, fix bug where previous installations, with emergency version greater than 1, could not be seen in registry on overinstall
---

diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index 4276a07cb7..00a6d1aeff 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 1bf9d58c4e..e9b30fd954 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