summary refs log tree commit diff
path: root/src/timeline
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-05-30 00:23:57 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2021-05-30 00:23:57 +0200
commit18ff58edb3bc186e2114efad34de7ffca803be02 (patch)
tree2e312b1812bda001ca2c68a48cf7cf9711a93e69 /src/timeline
parentFix warning (diff)
downloadnheko-18ff58edb3bc186e2114efad34de7ffca803be02.tar.xz
Fix use after free from Qml widget
Diffstat (limited to 'src/timeline')
-rw-r--r--src/timeline/RoomlistModel.cpp3
-rw-r--r--src/timeline/TimelineViewManager.cpp5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp

index d2ba0dc3..283224f1 100644 --- a/src/timeline/RoomlistModel.cpp +++ b/src/timeline/RoomlistModel.cpp
@@ -13,7 +13,8 @@ #include "UserSettingsPage.h" RoomlistModel::RoomlistModel(TimelineViewManager *parent) - : manager(parent) + : QAbstractListModel(parent) + , manager(parent) { connect(ChatPage::instance(), &ChatPage::decryptSidebarChanged, this, [this]() { auto decrypt = ChatPage::instance()->userSettings()->decryptSidebar(); diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 3b3ea423..dd623f2f 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp
@@ -129,7 +129,8 @@ TimelineViewManager::userStatus(QString id) const } TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *parent) - : imgProvider(new MxcImageProvider()) + : QObject(parent) + , imgProvider(new MxcImageProvider()) , colorImgProvider(new ColorImageProvider()) , blurhashProvider(new BlurhashProvider()) , callManager_(callManager) @@ -230,7 +231,7 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par "Error: Only enums"); #ifdef USE_QUICK_VIEW - view = new QQuickView(); + view = new QQuickView(parent); container = QWidget::createWindowContainer(view, parent); #else view = new QQuickWidget(parent);