Merge remote-tracking branch 'origin/develop' into display_room_avatars

Conflicts: Vector/ViewController/RoomViewController.m
2026-05-01 05:36:57 +02:00 · 2015-12-04 16:43:11 +01:00
parent eb371f7d8e 41e09d59f0
commit 74de3eeb0f
108 changed files with 787 additions and 494 deletions
@@ -382,14 +382,16 @@
            name = member.displayname;
        }
        
+        // sanity check
        if (name)
        {
            [names addObject:name];
        }
        else
        {
-            i--;
+            // invalid member name
            count--;
+            i--;
        }
    }