From d6e1862c08e1ec5967fdfb8df3bacadf2d3a1c8f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Mar 2018 02:26:19 +0400
Subject: [PATCH] Fix crash in AdminLog view with deleted delegates.
---
.../history/admin_log/history_admin_log_inner.cpp | 3 +++
.../history/admin_log/history_admin_log_item.cpp | 11 ++++++++---
.../history/admin_log/history_admin_log_item.h | 2 ++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
index 1d74c0ef6a..59edff71e1 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -531,6 +531,9 @@ void InnerWidget::saveState(not_null<SectionMemento*> memento) {
void InnerWidget::restoreState(not_null<SectionMemento*> memento) {
_items = memento->takeItems();
+ for (auto &item : _items) {
+ item.refreshView(this);
+ }
_itemsByIds = memento->takeItemsByIds();
if (auto manager = memento->takeIdManager()) {
_idManager = std::move(manager);
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
index 783ab111e2..c45c08394a 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -195,9 +195,9 @@ auto GenerateBannedChangeText(const TextWithEntities &user, const MTPChannelBann
lt_date,
langDateTime(ParseDateTime(newUntil)));
auto result = lng_admin_log_restricted__generic(
- lt_user,
- user,
- lt_until,
+ lt_user,
+ user,
+ lt_until,
TextWithEntities { untilText });
static auto phraseMap = std::map<Flags, LangKey> {
@@ -317,6 +317,11 @@ OwnedItem::~OwnedItem() {
}
}
+void OwnedItem::refreshView(
+ not_null<HistoryView::ElementDelegate*> delegate) {
+ _view = _data->createView(delegate);
+}
+
void GenerateItems(
not_null<HistoryView::ElementDelegate*> delegate,
not_null<History*> history,
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.h
index 7f238be382..05cc07132b 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.h
@@ -46,6 +46,8 @@ public:
return get();
}
+ void refreshView(not_null<HistoryView::ElementDelegate*> delegate);
+
private:
HistoryItem *_data = nullptr;
std::unique_ptr<HistoryView::Element> _view;