Merge origin/master and fix conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/timeline/Permissions.cpp b/src/timeline/Permissions.cpp

index 1eaab468..e4957045 100644
--- a/src/timeline/Permissions.cpp
+++ b/src/timeline/Permissions.cpp
@@ -8,9 +8,9 @@
 #include "MatrixClient.h"
 #include "TimelineModel.h"
 
-Permissions::Permissions(TimelineModel *parent)
+Permissions::Permissions(QString roomId, QObject *parent)
   : QObject(parent)
-  , room(parent)
+  , roomId_(roomId)
 {
         invalidate();
 }
@@ -19,7 +19,7 @@ void
 Permissions::invalidate()
 {
         pl = cache::client()
-               ->getStateEvent<mtx::events::state::PowerLevels>(room->roomId().toStdString())
+               ->getStateEvent<mtx::events::state::PowerLevels>(roomId_.toStdString())
                .value_or(mtx::events::StateEvent<mtx::events::state::PowerLevels>{})
                .content;
 }