From ba7ee37899bdb2e0b8ff9eb681560370123a8f33 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 28 Oct 2020 18:29:05 +0000
Subject: [PATCH] Fix stuck never-sending messages

Another cached promise that wasn't cleared on failure
---
 src/crypto/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/crypto/index.js b/src/crypto/index.js
index e7898a2c7..369e647f5 100644
--- a/src/crypto/index.js
+++ b/src/crypto/index.js
@@ -2640,7 +2640,10 @@ Crypto.prototype.trackRoomDevices = function(roomId) {
     let promise = this._roomDeviceTrackingState[roomId];
     if (!promise) {
         promise = trackMembers();
-        this._roomDeviceTrackingState[roomId] = promise;
+        this._roomDeviceTrackingState[roomId] = promise.catch(err => {
+            this._roomDeviceTrackingState[roomId] = null;
+            throw err;
+        });
     }
     return promise;
 };