summaryrefslogtreecommitdiff
path: root/src/network/room.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/network/room.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/network/room.cpp b/src/network/room.cpp
index 22491b299..b22c5fb89 100644
--- a/src/network/room.cpp
+++ b/src/network/room.cpp
@@ -29,8 +29,8 @@ public:
29 std::atomic<State> state{State::Closed}; ///< Current state of the room. 29 std::atomic<State> state{State::Closed}; ///< Current state of the room.
30 RoomInformation room_information; ///< Information about this room. 30 RoomInformation room_information; ///< Information about this room.
31 31
32 std::string verify_UID; ///< A GUID which may be used for verfication. 32 std::string verify_uid; ///< A GUID which may be used for verfication.
33 mutable std::mutex verify_UID_mutex; ///< Mutex for verify_UID 33 mutable std::mutex verify_uid_mutex; ///< Mutex for verify_uid
34 34
35 std::string password; ///< The password required to connect to this room. 35 std::string password; ///< The password required to connect to this room.
36 36
@@ -369,8 +369,8 @@ void Room::RoomImpl::HandleJoinRequest(const ENetEvent* event) {
369 369
370 std::string uid; 370 std::string uid;
371 { 371 {
372 std::lock_guard lock(verify_UID_mutex); 372 std::lock_guard lock(verify_uid_mutex);
373 uid = verify_UID; 373 uid = verify_uid;
374 } 374 }
375 member.user_data = verify_backend->LoadUserData(uid, token); 375 member.user_data = verify_backend->LoadUserData(uid, token);
376 376
@@ -1056,8 +1056,8 @@ const RoomInformation& Room::GetRoomInformation() const {
1056} 1056}
1057 1057
1058std::string Room::GetVerifyUID() const { 1058std::string Room::GetVerifyUID() const {
1059 std::lock_guard lock(room_impl->verify_UID_mutex); 1059 std::lock_guard lock(room_impl->verify_uid_mutex);
1060 return room_impl->verify_UID; 1060 return room_impl->verify_uid;
1061} 1061}
1062 1062
1063Room::BanList Room::GetBanList() const { 1063Room::BanList Room::GetBanList() const {
@@ -1086,8 +1086,8 @@ bool Room::HasPassword() const {
1086} 1086}
1087 1087
1088void Room::SetVerifyUID(const std::string& uid) { 1088void Room::SetVerifyUID(const std::string& uid) {
1089 std::lock_guard lock(room_impl->verify_UID_mutex); 1089 std::lock_guard lock(room_impl->verify_uid_mutex);
1090 room_impl->verify_UID = uid; 1090 room_impl->verify_uid = uid;
1091} 1091}
1092 1092
1093void Room::Destroy() { 1093void Room::Destroy() {