From d16807c4935e961b6a087bf20412299ef1a7b46c Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Sat, 8 May 2021 19:30:55 +0530 Subject: Franz catchups to version 5.6.0 that are not related to macOS (#1372) * Fix browser control icons in dark mode * Upgraded 'electron-builder' * Added missing system-dependencies for development of ferdi on linux * Fix crashes on navigation changes/reloads --- src/features/webControls/components/WebControls.js | 1 + src/index.js | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js index c6331073b..b9403bd0d 100644 --- a/src/features/webControls/components/WebControls.js +++ b/src/features/webControls/components/WebControls.js @@ -65,6 +65,7 @@ const styles = theme => ({ width: '20px !important', height: 20, marginTop: 5, + color: theme.colorText, }, input: { marginBottom: 0, diff --git a/src/index.js b/src/index.js index b29cec831..2ca8d451b 100644 --- a/src/index.js +++ b/src/index.js @@ -57,9 +57,7 @@ const debug = require('debug')('Ferdi:App'); // From Electron 9 onwards, app.allowRendererProcessReuse = true by default. This causes the app to crash on Windows due to the // Electron Windows Notification API crashing. Setting this to false fixes the issue until the electron team fixes the notification bug // More Info - https://github.com/electron/electron/issues/18397 -if (isWindows) { - app.allowRendererProcessReuse = false; -} +app.allowRendererProcessReuse = false; // Globally set useragent to fix user agent override in service workers debug('Set userAgent to ', userAgent()); @@ -378,7 +376,8 @@ if (argv['auth-negotiate-delegate-whitelist']) { } // Disable Chromium's poor MPRIS implementation -app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService'); +// and apply workaround for https://github.com/electron/electron/pull/26432 +app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService,CrossOriginOpenerPolicy'); // This method will be called when Electron has finished // initialization and is ready to create browser windows. -- cgit v1.2.3-54-g00ecf