Installer: Remove Uninstall shortcut from start menu folder (#3076909)

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 14b7d70..04c9e7e 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -18,6 +18,7 @@ WinMerge 2.13.14 - 2010-09-15 (r7263)
   Comment filtering improvement (#3034083)
   Allow giving encoding name as custom codepage (#2813825, #3010934)
   Installer: Drop Windows 9x/ME/NT4 support from InnoSetup (#3025078)
+  Installer: Remove Uninstall shortcut from start menu folder (#3076909)
   Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed 
     in status bar (#3025855)
   Bugfix: Options dialog didn't update when importing settings

diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss
index ef93836..c6a69bd 100755 (executable)
--- a/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@ -330,6 +330,9 @@ Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Typ
 ;This removes the desktop icon in case the user chooses not to install it after previously having it installed
 Name: {commondesktop}\WinMerge.lnk; Type: files; Check: not IsTaskSelected('DesktopIcon')
 
+;Removes the Uninstall icon from the start menu...
+Name: {group}\{cm:UninstallProgram,WinMerge}.lnk; Type: files;
+
 ;Remove ANSI executable link from start menu for NT-based Windows versions
 ;This was installed earlier, but not anymore.
 Name: {group}\WinMerge (ANSI).lnk; Type: files; MinVersion: 0,4
@@ -453,7 +456,6 @@ Source: ..\..\Plugins\dlls\insert datetime.sct; DestDir: {app}\MergePlugins; Fla
 Name: {group}\WinMerge; Filename: {app}\{code:ExeName}
 Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
 Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm
-Name: {group}\{cm:UninstallProgram,WinMerge}; Filename: {uninstallexe}
 Name: {group}\{cm:ProgramOnTheWeb,WinMerge}; Filename: http://winmerge.org/
 
 ;Link to translated ReadMe in Start Menu