diff options
| author | Marius David Wieschollek <passwords.public@mdns.eu> | 2021-01-16 23:09:57 +0300 |
|---|---|---|
| committer | Marius David Wieschollek <passwords.public@mdns.eu> | 2021-01-16 23:09:57 +0300 |
| commit | 625c1985cdcee2ea2633d32b60d6b3f09b505ff6 (patch) | |
| tree | 702843bcfb891021b50f772777ccb7022ba78ca9 | |
| parent | 7ca320f77ec3e59db37ae8bd73bf1706cbf5c906 (diff) | |
| parent | ed0773bf1b8debedca6300f71b036faebd850852 (diff) | |
Merge branch '2.0.4'
# Conflicts:
# package-lock.json
| -rw-r--r-- | package-lock.json | 2 | ||||
| -rw-r--r-- | src/js/Manager/ErrorManager.js | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/package-lock.json b/package-lock.json index 406199e..1cb757d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3592,7 +3592,7 @@ }, "passwords-client": { "version": "https://git.mdns.eu/nextcloud/passwords-client/-/archive/master/passwords-client-master.tar.gz", - "integrity": "sha512-Lh+0BrzEv44X+f7mhK9eNVKkovlJitOIFXZhoFth2f32i87D2yF1xSdqxwja3VNtLAuNXJXUDfNv73G4jSy5Pw==", + "integrity": "sha512-xdLEG1pSRQupAcDbgOOopaCGYmIcF7b9ariISN8eX4chx9A7ReVajJv+SEMM2FBArHzOJuPixc8IFR8yfGjmzw==", "dev": true, "requires": { "eventemitter3": "^4.0.7", diff --git a/src/js/Manager/ErrorManager.js b/src/js/Manager/ErrorManager.js index ca1ee23..6cfb48c 100644 --- a/src/js/Manager/ErrorManager.js +++ b/src/js/Manager/ErrorManager.js @@ -16,6 +16,7 @@ class ErrorManager { constructor() { this._errors = []; this._mode = 'client'; + this._sending = true; } /** @@ -270,12 +271,14 @@ class ErrorManager { * @private */ async _sendError(data) { + if(!this._sending) return; try { await SystemService.waitReady(); await QueueService .getQueue('error', 'background') .push(data); } catch(e) { + this._sending = false; this.logError(e); } } |