From 733f8951e43ba56d2412adee968ce765613bfa15 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Fri, 8 Mar 2024 11:55:19 -0500
Subject: [PATCH] fix windows installer after jdk update

---
 desktop/package/package.gradle   |  2 +-
 desktop/package/windows/main.wxs | 44 +++++++++++++++-----------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle
index d6c18203..a5e1d72c 100644
--- a/desktop/package/package.gradle
+++ b/desktop/package/package.gradle
@@ -284,7 +284,7 @@ task packageInstallers {
                             " --win-shortcut"
             )
 
-            executeCmd(jPackageFilePath + commonOpts + windowsOpts + " --win-console --type exe")
+            executeCmd(jPackageFilePath + commonOpts + windowsOpts + " --verbose > desktop/build/output.txt --type exe")
         } else if (Os.isFamily(Os.FAMILY_MAC)) {
             // See https://docs.oracle.com/en/java/javase/14/jpackage/override-jpackage-resources.html
             // for details of "--resource-dir"
diff --git a/desktop/package/windows/main.wxs b/desktop/package/windows/main.wxs
index 9c04430f..58100e42 100644
--- a/desktop/package/windows/main.wxs
+++ b/desktop/package/windows/main.wxs
@@ -92,6 +92,23 @@
    <WixVariable Id="WixUIDialogBmp" Value="$(var.ImageDir)/WixUIDialogBmp.bmp" />
 
     <UI>
+      <!-- Run WixUI_InstallDir dialog in the default install directory. -->
+      <UIRef Id="WixUI_InstallDir" />
+
+      <?ifndef JpLicenseRtf ?>
+      <!--
+        No license file provided.
+        Override the dialog sequence in built-in dialog set "WixUI_InstallDir"
+        to exclude license dialog.
+      -->
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
+      <?endif?>
+
+      <?ifdef JpLicenseRtf ?>
+      <UIRef Id="WixUI_Minimal" />
+      <?endif?>
+
       <?ifdef JpInstallDirChooser ?>
       <Dialog Id="JpInvalidInstallDir" Width="300" Height="85" Title="[ProductName] Setup" NoMinimize="yes">
         <Control Id="JpInvalidInstallDirYes" Type="PushButton" X="100" Y="55" Width="50" Height="15" Default="no" Cancel="no" Text="Yes">
@@ -104,33 +121,11 @@
           <Text>!(loc.message.install.dir.exist)</Text>
         </Control>
       </Dialog>
-
-      <!--
-        Run WixUI_InstallDir dialog in the default install directory.
-      -->
-      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
-      <UIRef Id="WixUI_InstallDir" />
-
+      
       <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="JpCheckInstallDir" Order="3">1</Publish>
       <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="JpInvalidInstallDir" Order="5">INSTALLDIR_VALID="0"</Publish>
       <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="5">INSTALLDIR_VALID="1"</Publish>
-
-      <?ifndef JpLicenseRtf ?>
-      <!--
-        No license file provided.
-        Override the dialog sequence in built-in dialog set "WixUI_InstallDir"
-        to exclude license dialog.
-      -->
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
-      <?endif?>
-
-      <?else?>
-
-      <?ifdef JpLicenseRtf ?>
-      <UIRef Id="WixUI_Minimal" />
-      <?endif?>
-
+      
       <?endif?>
       <!-- Add launch app configuration -->
       <Publish Dialog="ExitDialog" 
@@ -139,6 +134,7 @@
             Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
     </UI>
     
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch $(var.JpAppName)" />
     <Property Id="WixShellExecTarget" Value="[INSTALLDIR]/$(var.JpAppName).exe" />
     <CustomAction Id="LaunchApplication"