Merge remote-tracking branch 'origin/dev' into dev

chat2db · Dec 13, 2023 · bea86eb · bea86eb
2 parents cf84d91 + 867a691
commit bea86eb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/chat2db-client/src/main/preload.js b/chat2db-client/src/main/preload.js
@@ -6,8 +6,9 @@ const { readVersion } = require('./utils');
 
 contextBridge.exposeInMainWorld('electronApi', {
   startServerForSpawn: async () => {
-    const javaPath = path.join(__dirname, '../..', `./versions/${readVersion()}`, `./static/${JAVA_APP_NAME}`);
-    const libPath = path.join(__dirname, '../..', `./versions/${readVersion()}`, './static/lib');
+    const appVersion = readVersion();
+    const javaPath = path.join(__dirname, '../..', `./versions/${appVersion}`, `./static/${JAVA_APP_NAME}`);
+    const libPath = path.join(__dirname, '../..', `./versions/${appVersion}`, './static/lib');
 
     const productName = await ipcRenderer.invoke('get-product-name');
 
@@ -22,7 +23,7 @@ contextBridge.exposeInMainWorld('electronApi', {
       '-Dchat2db.mode=DESKTOP',
       `-Dproject.path=${javaPath}`,
       `-Dloader.path=${libPath}`,
-      `-Dclient.version=${readVersion()}`,
+      `-Dclient.version=${appVersion}`,
       '-Xmx1024M',
       '-jar',
       javaPath,