Merge branch 'master' into master

1 files changed, 4 insertions, 2 deletions

diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp

index 546cda29..380ed295 100644
--- a/src/ui/RoomSettings.cpp
+++ b/src/ui/RoomSettings.cpp
@@ -1,5 +1,6 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
 // SPDX-FileCopyrightText: 2022 Nheko Contributors
+// SPDX-FileCopyrightText: 2023 Nheko Contributors
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -132,7 +133,7 @@ RoomSettings::roomAvatarUrl()
 int
 RoomSettings::memberCount() const
 {
-    return info_.member_count;
+    return static_cast<int>(info_.member_count);
 }
 
 void
@@ -180,7 +181,8 @@ QStringList
 RoomSettings::allowedRooms() const
 {
     QStringList rooms;
-    rooms.reserve(accessRules_.allow.size());
+    assert(accessRules_.allow.size() < std::numeric_limits<int>::max());
+    rooms.reserve(static_cast<int>(accessRules_.allow.size()));
     for (const auto &e : accessRules_.allow) {
         if (e.type == mtx::events::state::JoinAllowanceType::RoomMembership)
             rooms.push_back(QString::fromStdString(e.room_id));