Merge pull request #4036 from matrix-org/jryans/mkey-remove

Fix listener removal in verification tile
2020-02-05 09:38:48 +00:00
parent f89ae19d76 110c5f0e61
commit d3cf4f132c
1 changed files with 4 additions and 1 deletions
--- a/src/components/views/messages/MKeyVerificationConclusion.js
+++ b/src/components/views/messages/MKeyVerificationConclusion.js
@@ -40,7 +40,10 @@ export default class MKeyVerificationConclusion extends React.Component {
        if (request) {
            request.off("change", this._onRequestChanged);
        }
-        MatrixClientPeg.removeListener("userTrustStatusChanged", this._onTrustChanged);
+        const cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener("userTrustStatusChanged", this._onTrustChanged);
+        }
    }

    _onRequestChanged = () => {