Disable clicking on room icon in a better way

Signed-off-by: Aaron Raimist <[email protected]>
matrix-org · Jan 29, 2019 · cd11d07 · cd11d07
1 parent 53947be
commit cd11d07
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
@@ -138,10 +138,6 @@ module.exports = React.createClass({
             MatrixClientPeg.get().getHomeserverUrl(),
             null, null, null, false);
 
-        if (!avatarUrl) {
-            return;
-        }
-
         const ImageView = sdk.getComponent("elements.ImageView");
         const params = {
             src: avatarUrl,
@@ -163,7 +159,8 @@ module.exports = React.createClass({
             <BaseAvatar {...otherProps} name={roomName}
                 idName={room ? room.roomId : null}
                 urls={this.state.urls}
-                onClick={this.props.viewAvatarOnClick ? this.onRoomAvatarClick : null} />
+                onClick={this.props.viewAvatarOnClick ? this.onRoomAvatarClick : null}
+                disabled={!this.state.urls[0]} />
         );
     },
 });