Merge branch 'master' into develop

This commit is contained in:
Andy Uhnak
2022-03-18 17:01:32 +00:00
2 changed files with 8 additions and 1 deletions
@@ -630,7 +630,7 @@
}
// Check whether the option Ignore may be presented
if (RiotSettings.shared.roomMemberScreenShowIgnore && self.mxRoomMember.membership == MXMembershipJoin)
if (RiotSettings.shared.roomMemberScreenShowIgnore)
{
// is he already ignored ?
if (![self.mainSession isUserIgnored:self.mxRoomMember.userId])