From 5d436992423961258ad861c01e3b9b30f3317aab Mon Sep 17 00:00:00 2001 From: Edwin Joassart Date: Fri, 26 Jan 2024 16:22:35 +0100 Subject: [PATCH 1/2] patch: fix typo in IPC server id --- lib/gui/app/modules/api.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gui/app/modules/api.ts b/lib/gui/app/modules/api.ts index dd5fa905..fcde1a80 100644 --- a/lib/gui/app/modules/api.ts +++ b/lib/gui/app/modules/api.ts @@ -112,10 +112,10 @@ function startApiAndSpawnChild({ // server/client has a different name. const IPC_SERVER_ID = `etcher-server-${process.pid}-${Date.now()}-${ withPrivileges ? 'privileged' : 'unprivileged' - }}}`; + }`; const IPC_CLIENT_ID = `etcher-client-${process.pid}-${Date.now()}-${ withPrivileges ? 'privileged' : 'unprivileged' - }}`; + }`; const IPC_SOCKET_ROOT = path.join( process.env.XDG_RUNTIME_DIR || os.tmpdir(), From 196fd8ae24de2a23ebaeae736c6ca41007162fa1 Mon Sep 17 00:00:00 2001 From: Edwin Joassart Date: Fri, 26 Jan 2024 17:54:29 +0100 Subject: [PATCH 2/2] patch: remove screensaver error when not on etcher-pro --- lib/gui/app/models/flash-state.ts | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/gui/app/models/flash-state.ts b/lib/gui/app/models/flash-state.ts index faa1a4a1..9cf59035 100644 --- a/lib/gui/app/models/flash-state.ts +++ b/lib/gui/app/models/flash-state.ts @@ -47,13 +47,7 @@ export function isFlashing(): boolean { */ export function setFlashingFlag() { // see https://github.com/balenablocks/balena-electron-env/blob/4fce9c461f294d4a768db8f247eea6f75d7b08b0/README.md#remote-methods - try { - electron.ipcRenderer.invoke('disable-screensaver'); - } catch (error) { - console.log( - "Can't disable-screensaver, we're probably not running on a balena-electron env", - ); - } + electron.ipcRenderer.send('disable-screensaver'); store.dispatch({ type: Actions.SET_FLASHING_FLAG, data: {}, @@ -76,7 +70,8 @@ export function unsetFlashingFlag(results: { data: results, }); // see https://github.com/balenablocks/balena-electron-env/blob/4fce9c461f294d4a768db8f247eea6f75d7b08b0/README.md#remote-methods - electron.ipcRenderer.invoke('enable-screensaver'); + + electron.ipcRenderer.send('enable-screensaver'); } export function setDevicePaths(devicePaths: string[]) {