Skip to content

fix(compass): Catch all errors during theme update #2902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 18, 2022
Merged

fix(compass): Catch all errors during theme update #2902

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 25 additions & 23 deletions packages/compass/src/main/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
// based off of https://github.com/atom/atom/blob/master/src/browser/application-menu.coffee
// use js2.coffee to convert it to JS
import {
BrowserWindow,
Menu,
app,
dialog,
shell,
nativeTheme,
MenuItemConstructorOptions,
} from 'electron';
import type { MenuItemConstructorOptions } from 'electron';
import { BrowserWindow, Menu, app, dialog, shell, nativeTheme } from 'electron';
import { ipcMain } from 'hadron-ipc';
import fs from 'fs';
import path from 'path';
Expand All @@ -31,21 +22,32 @@ class ThemeState {
function updateTheme({
theme
}: ThemeState) {
if (theme === THEMES.OS_THEME) {
if (nativeTheme.shouldUseDarkColors) {
try {
if (theme === THEMES.OS_THEME) {
if (nativeTheme.shouldUseDarkColors) {
ipcMain.broadcast('app:darkreader-enable');
} else {
ipcMain.broadcast('app:darkreader-disable');
}
return;
}

if (theme === THEMES.DARK) {
ipcMain.broadcast('app:darkreader-enable');
} else {
ipcMain.broadcast('app:darkreader-disable');
return;
}
return;
}

if (theme === THEMES.DARK) {
ipcMain.broadcast('app:darkreader-enable');
return;

ipcMain.broadcast('app:darkreader-disable');
} catch (e) {
// TODO: Seems like sometimes we are broadcasting theme update too fast
// causing ipc.send to fail with "Render frame was disposed before
// WebFrameMain could be accessed" error.
//
// This is a workaround that just swallows the issue and allows app not to
// break while trying to switch the theme. We should inspect the
// implementation and do a better fix in the scope of https://jira.mongodb.org/browse/COMPASS-5606
debug('Failed to broadcast theme change', e);
}

ipcMain.broadcast('app:darkreader-disable');
}

function separator(): MenuItemConstructorOptions {
Expand Down