diff options
author | dec05eba <dec05eba@protonmail.com> | 2021-05-21 02:00:42 +0200 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2021-05-21 02:00:42 +0200 |
commit | d8df07625aec624f12377e05554387cdfeef33df (patch) | |
tree | d37b2756db5fed90410a774899f56d445a408105 /plugins | |
parent | 6ee9e8bf65c5b40a0265baee182369a0bf5f04df (diff) |
Fix deadlock by reference to stack local room outside the function
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Matrix.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/Matrix.hpp b/plugins/Matrix.hpp index 1c71733..ebaa166 100644 --- a/plugins/Matrix.hpp +++ b/plugins/Matrix.hpp @@ -164,7 +164,7 @@ namespace QuickMedia { size_t index = 0; private: - std::recursive_mutex user_mutex; + std::mutex user_mutex; std::recursive_mutex room_mutex; std::string name; @@ -639,6 +639,8 @@ namespace QuickMedia { MatrixDelegate *delegate = nullptr; std::optional<std::string> filter_cached; + std::vector<std::unique_ptr<RoomData>> invite_rooms; + std::unordered_set<std::string> my_events_transaction_ids; }; }
\ No newline at end of file |