Skip to content

Commit b8472c9

Browse files
author
Gary Keeble
committed
Add error protection
For invalid objects loading from cache
1 parent 0eff430 commit b8472c9

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

js/main.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -472,16 +472,19 @@ function BlackboxLogViewer() {
472472
return;
473473
}
474474

475+
try {
475476
// transfer the parameters from the log file into the settings data structure
476-
if(flightLog.getSysConfig().rcRate != null) {flightLogSettings[0].parameters[0].value = flightLog.getSysConfig().rcRate; }
477-
if(flightLog.getSysConfig().rcExpo != null) {flightLogSettings[0].parameters[1].value = flightLog.getSysConfig().rcExpo; }
478-
if(flightLog.getSysConfig().rRate != null) {flightLogSettings[0].parameters[2].value = flightLog.getSysConfig().rRate; }
479-
if(flightLog.getSysConfig().pRate != null) {flightLogSettings[0].parameters[3].value = flightLog.getSysConfig().pRate; }
480-
if(flightLog.getSysConfig().yRate != null) {flightLogSettings[0].parameters[4].value = flightLog.getSysConfig().yRate; }
481-
if(flightLog.getSysConfig().rcYawExpo != null) {flightLogSettings[0].parameters[5].value = flightLog.getSysConfig().rcYawExpo; }
482-
if(flightLog.getSysConfig().superExpoRate != null) {flightLogSettings[0].parameters[6].value = flightLog.getSysConfig().superExpoRate; }
483-
if(flightLog.getSysConfig().loopTime != null) {flightLogSettings[1].parameters[0].value = flightLog.getSysConfig().loopTime; }
484-
477+
if(flightLog.getSysConfig().rcRate != null) {flightLogSettings[0].parameters[0].value = flightLog.getSysConfig().rcRate; }
478+
if(flightLog.getSysConfig().rcExpo != null) {flightLogSettings[0].parameters[1].value = flightLog.getSysConfig().rcExpo; }
479+
if(flightLog.getSysConfig().rRate != null) {flightLogSettings[0].parameters[2].value = flightLog.getSysConfig().rRate; }
480+
if(flightLog.getSysConfig().pRate != null) {flightLogSettings[0].parameters[3].value = flightLog.getSysConfig().pRate; }
481+
if(flightLog.getSysConfig().yRate != null) {flightLogSettings[0].parameters[4].value = flightLog.getSysConfig().yRate; }
482+
if(flightLog.getSysConfig().rcYawExpo != null) {flightLogSettings[0].parameters[5].value = flightLog.getSysConfig().rcYawExpo; }
483+
if(flightLog.getSysConfig().superExpoFactor != null) {flightLogSettings[0].parameters[6].value = flightLog.getSysConfig().superExpoFactor; }
484+
if(flightLog.getSysConfig().loopTime != null) {flightLogSettings[1].parameters[0].value = flightLog.getSysConfig().loopTime; }
485+
} catch(e) {
486+
console.log('FlightLog Settings archive fault... ignoring');
487+
}
485488
if (graph) {
486489
graph.destroy();
487490
}

0 commit comments

Comments
 (0)