Fixed some avatar stuff

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

src/components/views/room_settings/RoomProfileSettings.js

@@ -62,6 +62,7 @@ export default class RoomProfileSettings extends React.Component {
     }
 
     _uploadAvatar = () => {
+        if (!this.state.canSetAvatar) return;
         this._avatarUpload.current.click();
     };
 

src/components/views/settings/AvatarSetting.js

@@ -65,7 +65,7 @@ const AvatarSetting = ({avatarUrl, avatarAltText, avatarName, uploadAvatar, remo
 
     const avatarClasses = classNames({
         "mx_AvatarSetting_avatar": true,
-        "mx_AvatarSetting_avatar_hovering": isHovering,
+        "mx_AvatarSetting_avatar_hovering": isHovering && uploadAvatar,
     });
     return <div className={avatarClasses}>
         {avatarElement}