From 7c25e5138594643fd6d75fc65bc96b2dacb31f19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sun, 27 Nov 2016 15:33:06 +0100 Subject: [PATCH] Win installer: fix a bug --- development/Win32/packaging/installer/ChangeLog.txt | 1 + development/Win32/packaging/installer/setup/uninstall.nsh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 73190e3b2f..ba767b86a3 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -7,6 +7,7 @@ - automatically install LaTeX package necessary for XeTeX in combinations with document languages like e.g. Georgian - fix bug that thesaurus for English (AU) was not installed +- fix bug when JabRef was uninstalled together with LyX - updated Norwegian, Swedish and Ukrainian translation of the installer - updated to JabRef 3.7 - updated to ImageMagick 7.0.3-8 diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index 3a4777fa66..1c34a55333 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -94,6 +94,7 @@ Section "un.LyX" un.SecUnProgramFiles # delete info that programs were installed together with LyX DeleteRegValue SHCTX "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" + DeleteRegValue SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef" "OnlyWithLyX" # for texindy the path to the perl.exe must unfortunately be in Windows' PATH variable # so we have to remove it now @@ -121,7 +122,7 @@ SectionEnd #--------------------------------- # MiKTeX -Section /o "un.MiKTeX" un.SecUnMiKTeX +Section "un.MiKTeX" un.SecUnMiKTeX ${if} $LaTeXInstalled == "MiKTeX" # only uninstall MiKTeX when it was installed together with LyX ReadRegStr $1 SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX ${MiKTeXDeliveredVersion}" "UninstallString" -- 2.39.2