Merge remote-tracking branch 'origin/main'

This commit is contained in:
Core 2022-07-13 15:08:59 +01:00
commit 914f407898
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
6 changed files with 1258 additions and 1196 deletions

View file

@ -372,7 +372,8 @@ export class BrowserWindow {
* @yields {object} Electron browser window
*/
async createWindow(): Promise<Electron.BrowserWindow> {
this.clientPort = await getPort({ port: 9000 });
const envPort = process.env?.CIDER_PORT || '9000'
this.clientPort = await getPort({ port: parseInt(envPort, 10) || 9000 });
BrowserWindow.verifyFiles();
this.StartWatcher(utils.getPath('themes'));
@ -1573,4 +1574,4 @@ export class BrowserWindow {
server2.start();
console.log('remote broadcasted')
}
}
}