From f69c9459f5d121a550b272e479a765b7a8a50ed9 Mon Sep 17 00:00:00 2001
From: Bane Stojkovic <bancika@gmail.com>
Date: Wed, 2 Apr 2025 22:14:36 +0200
Subject: [PATCH] Fixed Windows ZIP package issue with the bundled JRE

---
 diylc/diylc-core/src/main/resources/update.xml | 4 ++++
 diylc/diylc-swing/pom.xml                      | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/diylc/diylc-core/src/main/resources/update.xml b/diylc/diylc-core/src/main/resources/update.xml
index 31f0e6d0..469e9cde 100644
--- a/diylc/diylc-core/src/main/resources/update.xml
+++ b/diylc/diylc-core/src/main/resources/update.xml
@@ -377,6 +377,10 @@
 					<changeType>BUG_FIX</changeType>
 					<description>Using board underside display sometimes makes other components semi-transparent</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Fixed Windows ZIP package issue with the bundled JRE</description>
+				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>
diff --git a/diylc/diylc-swing/pom.xml b/diylc/diylc-swing/pom.xml
index b0795ecc..4b5b8957 100644
--- a/diylc/diylc-swing/pom.xml
+++ b/diylc/diylc-swing/pom.xml
@@ -658,8 +658,8 @@
                                         <copy file="${project.basedir}/deploy/win/diylc-x64.exe" 
                                               tofile="${project.build.directory}/zip-temp/diylc.exe" />
                                         
-                                        <!-- Copy JRE -->
-                                        <copy todir="${project.build.directory}/zip-temp/jre">
+                                        <!-- Copy JRE to jre17 folder instead of jre -->
+                                        <copy todir="${project.build.directory}/zip-temp/jre17">
                                             <fileset dir="${jre.dest.win64}" />
                                         </copy>