Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-23 07:36:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

Sentry fix: “Cannot read property 'split' of undefined” in linux theme resolution

Browse source
This commit is contained in:
Ben Gotow 2019-06-16 13:24:46 -05:00
parent 1547234040
commit 88dc7bb6b9
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/linux-theme-utils.ts
View file

@ -244,25 +244,27 @@ function getIconFromTheme(
*/ */
function getIconPath(iconName: string, size: number, context: string | string[], scale: 1 | 2 = 1) { function getIconPath(iconName: string, size: number, context: string | string[], scale: 1 | 2 = 1) {
let defaultTheme = getIconTheme(getIconThemeName()); let defaultTheme = getIconTheme(getIconThemeName());
if (defaultTheme != null) { if (!defaultTheme) return null;
let inherits = defaultTheme.data['Icon Theme']['Inherits'].split(',');
let icon = getIconFromTheme(defaultTheme, iconName, size, context, scale); const iconThemeObject = defaultTheme.data['Icon Theme'];
const inheritsList = iconThemeObject && iconThemeObject['Inherits'];
if (!inheritsList) return null;
const inherits = inheritsList.split(',');
let icon = getIconFromTheme(defaultTheme, iconName, size, context, scale);
if (icon !== null) {
return icon;
}
// in case the icon was not found in the theme, we search the inherited themes
for (let key of inherits) {
let inheritsTheme = getIconTheme(inherits[key]);
icon = getIconFromTheme(inheritsTheme, iconName, size, context);
if (icon !== null) { if (icon !== null) {
return icon; return icon;
} }
// in case the icon was not found in the theme, we search the inherited themes
for (let key of inherits) {
let inheritsTheme = getIconTheme(inherits[key]);
icon = getIconFromTheme(inheritsTheme, iconName, size, context);
if (icon !== null) {
return icon;
}
}
} }
return null; return null;
} }