Properly set initial expressPort value

# Conflicts:
#	www/js/app.js

Author: Jaifroid

www/js/app.js

@@ -1071,7 +1071,7 @@ if (window.electronAPI) {
         }
     });
     electronAPI.on('get-store-value', function (key, value) {
-        if (key === 'expressPort') {
+        if (value && key === 'expressPort') {
             params.expressPort = value;
             uiUtil.setExpressServerUI(value);
         }
@@ -1981,7 +1981,7 @@ if (window.electronAPI) {
         // Ensure the port is a number and the value matches a permitted value
         var proposedPort = parseInt(e.target.value);
         if (proposedPort !== e.target.value && (proposedPort < 1024 || proposedPort > 65535)) {
-            e.target.value = params.expressPort || 3000;
+            e.target.value = params.expressPort;
             setTimeout(function () {
                 uiUtil.systemAlert('Please enter a valid port number between 1024 and 65535!');
             }, 250);

www/js/init.js

@@ -86,7 +86,11 @@ params['cachedStartPages'] = {
     mdwiki_en_all_maxi: 'C/Wikipedia%253AWikiProject_Medicine/Open_Textbook_of_Medicine2',
     wikivoyage_en_all_maxi: 'C/Main_Page'
 };
-
+if (window.electronAPI) {
+    // Initial port for Express server in Electron: this will be different for base app (3000), WikiMed (3001) and Wikivoyage (3002)
+    // This will be overridden by the actual port defined or stored in main.cjs
+    params['expressPort'] = 3000;
+}
 params['win7ElectronVersion'] = '22.3'; // KEEP UP TO DATE!!! This is the last minor version to support Win 7/8/8.1. Auto-update is embargoed for values starting with this.
 params['kiwixDownloadServer'] = 'https://download.kiwix.org/zim/'; // Include final slash
 params['kiwixDownloadMirrors'] = ['https://ftp.fau.de/kiwix/zim/', 'https://mirrors.dotsrc.org/kiwix/zim/', 'https://www.mirrorservice.org/sites/download.kiwix.org/zim/', 'https://md.mirrors.hacktegic.com/kiwix-md/zim/', 'https://library.kiwix.org'];