Merge branch 'rc-1.53.0'

# Conflicts:
#	js/aboutApp/index.js
This commit is contained in:
Vishwas Shashidhar 2018-11-13 14:37:45 +05:30
commit f2251ffd1a

View File

@ -9,7 +9,6 @@ const logLevels = require('../enums/logLevels.js');
const { version, clientVersion, buildNumber } = require('../../package.json');
const { initCrashReporterMain, initCrashReporterRenderer } = require('../crashReporter.js');
const i18n = require('../translation/i18n');
const { isMac } = require('../utils/misc');
let aboutWindow;
@ -89,10 +88,6 @@ function openAboutWindow(windowName) {
initCrashReporterMain({ process: 'about app window' });
initCrashReporterRenderer(aboutWindow, { process: 'render | about app window' });
aboutWindow.webContents.send('versionInfo', { version, clientVersion, buildNumber });
if (!isMac) {
// prevents from displaying menu items when "alt" key is pressed
aboutWindow.setMenu(null);
}
});
aboutWindow.webContents.on('crashed', function () {