Merge pull request #2513 from jryans/null-dvb

Fix unmount TypeError in `DeviceVerifyButtons`
2019-01-25 22:57:45 -06:00
parent a07ba49641 d1b78e5b08
commit 4ac617c72b
1 changed files with 3 additions and 1 deletions
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@@ -42,7 +42,9 @@ export default React.createClass({

    componentWillUnmount: function() {
        const cli = MatrixClientPeg.get();
-        cli.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
+        if (cli) {
+            cli.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
+        }
    },

    onDeviceVerificationChanged: function(userId, deviceId, deviceInfo) {