jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-23 19:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3978 from balena-io/aethernet/fix-screensaver

Browse Source 
fix disabled-screensaver unhandled exception outside balena-electron env
This commit is contained in:
Balena CI 2023-01-16 15:21:13 +02:00 committed by GitHub
commit bd88e5a1ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gui/app/models/flash-state.ts
View File

@ -47,7 +47,13 @@ export function isFlashing(): boolean {
*/ */
export function setFlashingFlag() { export function setFlashingFlag() {
// see https://github.com/balenablocks/balena-electron-env/blob/4fce9c461f294d4a768db8f247eea6f75d7b08b0/README.md#remote-methods // see https://github.com/balenablocks/balena-electron-env/blob/4fce9c461f294d4a768db8f247eea6f75d7b08b0/README.md#remote-methods
electron.ipcRenderer.invoke('disable-screensaver'); try {
electron.ipcRenderer.invoke('disable-screensaver');
} catch (error) {
console.log(
"Can't disable-screensaver, we're probably not running on a balena-electron env",
);
}
store.dispatch({ store.dispatch({
type: Actions.SET_FLASHING_FLAG, type: Actions.SET_FLASHING_FLAG,
data: {}, data: {},

2
lib/gui/app/modules/analytics.ts
View File

@ -221,9 +221,9 @@ export async function logEvent(message: string, data: AnalyticsPayload = {}) {
*/ */
export function logException(error: any) { export function logException(error: any) {
const shouldReportErrors = settings.getSync('errorReporting'); const shouldReportErrors = settings.getSync('errorReporting');
console.error(error);
if (shouldReportErrors) { if (shouldReportErrors) {
initAnalytics(); initAnalytics();
console.error(error);
SentryRenderer.captureException(error); SentryRenderer.captureException(error);
} }
} }

2
lib/gui/etcher.ts
View File

@ -65,8 +65,8 @@ async function checkForUpdates(interval: number) {
function logMainProcessException(error: any) { function logMainProcessException(error: any) {
const shouldReportErrors = settings.getSync('errorReporting'); const shouldReportErrors = settings.getSync('errorReporting');
console.error(error);
if (shouldReportErrors) { if (shouldReportErrors) {
console.error(error);
SentryMain.captureException(error); SentryMain.captureException(error);
} }
} }