Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-23 00:05:22 +03:00
Code Issues Wiki Activity

improve the way boot logo source image errors are handled to address issue #1077

Browse source
This commit is contained in:
Kiripolszky Károly 2018-07-03 00:38:56 +02:00
parent 192e886f30
commit 8322e86b57
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/LogoManager.js
View file

@ -80,7 +80,13 @@ LogoManager.init = function (font, logoStartIndex) {
var rgbPixel = ctx.getImageData(x, y, 1, 1).data.slice(0, 3),
colorKey = rgbPixel.join("-");
if (!this.constants.MCM_COLORMAP[colorKey]) {
GUI.log(i18n.getMessage("osdSetupCustomLogoColorMapError"));
GUI.log(i18n.getMessage("osdSetupCustomLogoColorMapError", {
valueR: rgbPixel[0],
valueG: rgbPixel[1],
valueB: rgbPixel[2],
posX: x,
posY: y,
}));
return false;
}
}
@ -162,7 +168,7 @@ LogoManager.openImage = function () {
this.showConstraintSatisfied(constraint);
} else {
this.showConstraintNotSatisfied(constraint);
reject();
reject("Boot logo image constraint violation");
return;
}
}