diff options
Diffstat (limited to 'src/network/room.cpp')
| -rw-r--r-- | src/network/room.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/network/room.cpp b/src/network/room.cpp index b82a75749..fe55d194c 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp | |||
| @@ -1066,8 +1066,8 @@ Room::BanList Room::GetBanList() const { | |||
| 1066 | return {room_impl->username_ban_list, room_impl->ip_ban_list}; | 1066 | return {room_impl->username_ban_list, room_impl->ip_ban_list}; |
| 1067 | } | 1067 | } |
| 1068 | 1068 | ||
| 1069 | std::vector<Room::Member> Room::GetRoomMemberList() const { | 1069 | std::vector<Member> Room::GetRoomMemberList() const { |
| 1070 | std::vector<Room::Member> member_list; | 1070 | std::vector<Member> member_list; |
| 1071 | std::lock_guard lock(room_impl->member_mutex); | 1071 | std::lock_guard lock(room_impl->member_mutex); |
| 1072 | for (const auto& member_impl : room_impl->members) { | 1072 | for (const auto& member_impl : room_impl->members) { |
| 1073 | Member member; | 1073 | Member member; |
| @@ -1076,7 +1076,8 @@ std::vector<Room::Member> Room::GetRoomMemberList() const { | |||
| 1076 | member.display_name = member_impl.user_data.display_name; | 1076 | member.display_name = member_impl.user_data.display_name; |
| 1077 | member.avatar_url = member_impl.user_data.avatar_url; | 1077 | member.avatar_url = member_impl.user_data.avatar_url; |
| 1078 | member.mac_address = member_impl.mac_address; | 1078 | member.mac_address = member_impl.mac_address; |
| 1079 | member.game_info = member_impl.game_info; | 1079 | member.game_name = member_impl.game_info.name; |
| 1080 | member.game_id = member_impl.game_info.id; | ||
| 1080 | member_list.push_back(member); | 1081 | member_list.push_back(member); |
| 1081 | } | 1082 | } |
| 1082 | return member_list; | 1083 | return member_list; |