diff options
| author | FearlessTobi <thm.frey@gmail.com> | 2022-07-15 21:11:09 +0200 |
|---|---|---|
| committer | FearlessTobi <thm.frey@gmail.com> | 2022-07-25 21:59:30 +0200 |
| commit | 4b404191cf054ec3206676f1fccc452bc0a0e223 (patch) | |
| tree | 8a1582246c41260fe82804bf4dcb9abf77176e27 /src/network/room.cpp | |
| parent | Address first part of review comments (diff) | |
| download | yuzu-4b404191cf054ec3206676f1fccc452bc0a0e223.tar yuzu-4b404191cf054ec3206676f1fccc452bc0a0e223.tar.gz yuzu-4b404191cf054ec3206676f1fccc452bc0a0e223.tar.bz2 yuzu-4b404191cf054ec3206676f1fccc452bc0a0e223.tar.lz yuzu-4b404191cf054ec3206676f1fccc452bc0a0e223.tar.xz yuzu-4b404191cf054ec3206676f1fccc452bc0a0e223.tar.zst yuzu-4b404191cf054ec3206676f1fccc452bc0a0e223.zip | |
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 { return {room_impl->username_ban_list, room_impl->ip_ban_list}; } -std::vector<Room::Member> Room::GetRoomMemberList() const { - std::vector<Room::Member> member_list; +std::vector<Member> Room::GetRoomMemberList() const { + std::vector<Member> member_list; std::lock_guard lock(room_impl->member_mutex); for (const auto& member_impl : room_impl->members) { Member member; @@ -1076,7 +1076,8 @@ std::vector<Room::Member> Room::GetRoomMemberList() const { member.display_name = member_impl.user_data.display_name; member.avatar_url = member_impl.user_data.avatar_url; member.mac_address = member_impl.mac_address; - member.game_info = member_impl.game_info; + member.game_name = member_impl.game_info.name; + member.game_id = member_impl.game_info.id; member_list.push_back(member); } return member_list; |