rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use normal instead of recursive mutex

This commit is contained in:
Nicolas Werner 2022-07-11 16:52:05 +02:00
parent eeaf16e442
commit 9056ca8615
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dbus/NhekoDBusBackend.cpp
View File

@ -26,7 +26,7 @@ struct RoomReplyState
{ {
QVector<nheko::dbus::RoomInfoItem> model; QVector<nheko::dbus::RoomInfoItem> model;
std::map<QString, RoomInfo> roominfos; std::map<QString, RoomInfo> roominfos;
std::recursive_mutex m; std::mutex m;
}; };
} }
@ -47,7 +47,6 @@ NhekoDBusBackend::rooms(const QDBusMessage &message)
} }
state->roominfos = cache::getRoomInfo(roomids); state->roominfos = cache::getRoomInfo(roomids);
std::lock_guard<std::recursive_mutex> parentLock(state->m);
for (const auto &room : roomListModel) { for (const auto &room : roomListModel) {
auto addRoom = [room, roomListModelSize = roomListModel.size(), message, state]( auto addRoom = [room, roomListModelSize = roomListModel.size(), message, state](
const QImage &image) { const QImage &image) {
@ -62,6 +61,7 @@ NhekoDBusBackend::rooms(const QDBusMessage &message)
alias = QString::fromStdString(val.alt_aliases.front()); alias = QString::fromStdString(val.alt_aliases.front());
} }
std::lock_guard<std::mutex> childLock(state->m);
state->model.push_back(nheko::dbus::RoomInfoItem{ state->model.push_back(nheko::dbus::RoomInfoItem{
room->roomId(), room->roomId(),
alias, alias,
@ -69,7 +69,6 @@ NhekoDBusBackend::rooms(const QDBusMessage &message)
image, image,
room->notificationCount()}); room->notificationCount()});
std::lock_guard<std::recursive_mutex> childLock(state->m);
if (state->model.size() == roomListModelSize) { if (state->model.size() == roomListModelSize) {
nhlog::ui()->debug("Sending {} rooms over D-Bus...", state->model.size()); nhlog::ui()->debug("Sending {} rooms over D-Bus...", state->model.size());
auto reply = message.createReply(); auto reply = message.createReply();