From 43ccceda395789f7a78ad7da6e6fbbdb14b10186 Mon Sep 17 00:00:00 2001
From: Eugene Chornyi <yu_jin@lyx.org>
Date: Sun, 12 Jul 2020 18:54:56 +0200
Subject: [PATCH] Wininstaller, remove the option to run LyX from the finish
 page

---
 development/Win32/packaging/installer/include/gui.nsh     | 8 ++++----
 development/Win32/packaging/installer/setup/configure.nsh | 6 +++---
 status.23x                                                | 4 ++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/development/Win32/packaging/installer/include/gui.nsh b/development/Win32/packaging/installer/include/gui.nsh
index 3f7e716abb..0e744636a5 100644
--- a/development/Win32/packaging/installer/include/gui.nsh
+++ b/development/Win32/packaging/installer/include/gui.nsh
@@ -65,10 +65,10 @@ Page custom LatexFolder LatexFolder_LeaveFunction
 # !define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)"
 # !define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_RUN}"
 
-!define MUI_FINISHPAGE_SHOWREADME
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME_FUNCTION StartLyX
-!define MUI_FINISHPAGE_SHOWREADME_TEXT $(FinishPageRun)
+#!define MUI_FINISHPAGE_SHOWREADME
+#!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+#!define MUI_FINISHPAGE_SHOWREADME_FUNCTION StartLyX
+#!define MUI_FINISHPAGE_SHOWREADME_TEXT $(FinishPageRun)
 !define MUI_FINISHPAGE_LINK $(TEXT_FINISH_WEBSITE)
 !define MUI_FINISHPAGE_LINK_LOCATION "https://www.lyx.org/"
 #!define MUI_PAGE_CUSTOMFUNCTION_SHOW CheckDesktopShortcut
diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 40722d593e..af98c038fc 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -250,11 +250,11 @@ SectionEnd
 #--------------------------------
 #
 
-Function StartLyX
+#Function StartLyX
 
   # run LyX in a command line window to give the users feedback about
   # the time consuming LaTeX package installation
   
-  Exec "$INSTDIR\${APP_RUN}"
+#  Exec "$INSTDIR\${APP_RUN}"
 
-FunctionEnd
+#FunctionEnd
diff --git a/status.23x b/status.23x
index cb41997c5e..46c3f64fb7 100644
--- a/status.23x
+++ b/status.23x
@@ -38,6 +38,10 @@ What's new
 
 * BUILD/INSTALLATION
 
+- Wininstaller, temporary remove the option to run LyX from the finish page
+  due to upcoming fix of the issue where after installing LyX as admin, this option
+  would execute LyX as admin too.
+
 
 
 ** Bug fixes:
-- 
2.39.5