Fixed minor telemetry bugs

This commit is contained in:
dosse91 2019-08-29 21:22:26 +02:00
parent c4d660440d
commit 1f117a4c5c
2 changed files with 5 additions and 0 deletions

View file

@ -299,6 +299,9 @@ Speedtest.prototype = {
console.error("Speedtest onend event threw exception: " + e); console.error("Speedtest onend event threw exception: " + e);
} }
clearInterval(this.updater); clearInterval(this.updater);
if(this._settings.mpot){
this._settings.telemetry_extra=this._originalExtra;
}
this._state = 4; this._state = 4;
} }
}.bind(this); }.bind(this);
@ -319,6 +322,7 @@ Speedtest.prototype = {
this._selectedServer.server + this._selectedServer.pingURL; this._selectedServer.server + this._selectedServer.pingURL;
this._settings.url_getIp = this._settings.url_getIp =
this._selectedServer.server + this._selectedServer.getIpURL; this._selectedServer.server + this._selectedServer.getIpURL;
this._originalExtra=this._settings.telemetry_extra;
if (typeof this._settings.telemetry_extra !== "undefined") { if (typeof this._settings.telemetry_extra !== "undefined") {
this._settings.telemetry_extra = JSON.stringify({ this._settings.telemetry_extra = JSON.stringify({
server: this._selectedServer.name, server: this._selectedServer.name,

View file

@ -249,6 +249,7 @@ this.addEventListener("message", function(e) {
} }
if (params[0] === "abort") { if (params[0] === "abort") {
// abort command // abort command
if (testState >= 4) return;
tlog("manually aborted"); tlog("manually aborted");
clearRequests(); // stop all xhr activity clearRequests(); // stop all xhr activity
runNextTest = null; runNextTest = null;