mirror of https://github.com/espruino/BangleApps
BTHRM - Fix infinite recursion if no cached data is available
parent
d16ee688d2
commit
228a2c410d
|
@ -426,14 +426,14 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
promise = promise.then(()=>{
|
promise = promise.then(()=>{
|
||||||
var getCharacteristicsPromise = Promise.resolve();
|
var characteristicsPromise = Promise.resolve();
|
||||||
if (characteristics.length == 0){
|
if (characteristics.length == 0){
|
||||||
getCharacteristicsPromise = getCharacteristicsPromise.then(()=>{
|
characteristicsPromise = characteristicsPromise.then(()=>{
|
||||||
log("Getting services");
|
log("Getting services");
|
||||||
return gatt.getPrimaryServices();
|
return gatt.getPrimaryServices();
|
||||||
});
|
});
|
||||||
|
|
||||||
getCharacteristicsPromise = getCharacteristicsPromise().then((services)=>{
|
characteristicsPromise = characteristicsPromise.then((services)=>{
|
||||||
log("Got services:", services);
|
log("Got services:", services);
|
||||||
var result = Promise.resolve();
|
var result = Promise.resolve();
|
||||||
for (var service of services){
|
for (var service of services){
|
||||||
|
@ -453,11 +453,11 @@
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
for (var characteristic of characteristics){
|
for (var characteristic of characteristics){
|
||||||
getCharacteristicsPromise = attachCharacteristicPromise(getCharacteristicsPromise, characteristic, true);
|
characteristicsPromise = attachCharacteristicPromise(characteristicsPromise, characteristic, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return getCharacteristicsPromise;
|
return characteristicsPromise;
|
||||||
});
|
});
|
||||||
|
|
||||||
promise = promise.then(()=>{
|
promise = promise.then(()=>{
|
||||||
|
|
Loading…
Reference in New Issue