From 1807dbe4d9201a6a24ac1ea82a5d167687f7760d Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Fri, 19 Apr 2024 20:41:30 +0200 Subject: [PATCH] Fix buildkey 404 --- src/js/tabs/firmware_flasher.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js index 371ebec04d..fadb65f9ba 100644 --- a/src/js/tabs/firmware_flasher.js +++ b/src/js/tabs/firmware_flasher.js @@ -393,10 +393,12 @@ firmware_flasher.initialize = function (callback) { self.buildApi.loadTarget(target, release, onTargetDetail); - if (self.validateBuildKey() && navigator.onLine) { - self.buildApi.loadOptionsByBuildKey(release, self.cloudBuildKey, buildOptions); + const OnInvalidBuildKey = () => self.buildApi.loadOptions(release, buildOptions); + + if (self.validateBuildKey()) { + self.buildApi.loadOptionsByBuildKey(release, self.cloudBuildKey, buildOptions, OnInvalidBuildKey); } else { - self.buildApi.loadOptions(release, buildOptions); + OnInvalidBuildKey(); } } @@ -1233,7 +1235,7 @@ firmware_flasher.updateDetectBoardButton = function() { }; firmware_flasher.validateBuildKey = function() { - return this.cloudBuildKey?.length === 32; + return this.cloudBuildKey?.length === 32 && navigator.onLine; }; /** @@ -1319,7 +1321,7 @@ firmware_flasher.verifyBoard = function() { } function getBuildInfo() { - if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45) && navigator.onLine && FC.CONFIG.flightControllerIdentifier === 'BTFL') { + if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45) && FC.CONFIG.flightControllerIdentifier === 'BTFL') { MSP.send_message(MSPCodes.MSP2_GET_TEXT, mspHelper.crunch(MSPCodes.MSP2_GET_TEXT, MSPCodes.BUILD_KEY), false, () => { MSP.send_message(MSPCodes.MSP2_GET_TEXT, mspHelper.crunch(MSPCodes.MSP2_GET_TEXT, MSPCodes.CRAFT_NAME), false, () => { // store FC.CONFIG.buildKey as the object gets destroyed after disconnect