From 9f6d9ec48cc0777e733817416977ae0d3734cdc9 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 20 Jan 2019 17:59:02 +0300 Subject: [PATCH] Fix crash. GitOrigin-RevId: 4463222ba6259feb15ee74face187d430030401d --- td/telegram/MessagesManager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index b2e50bb3e..c8e3c5165 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -12797,14 +12797,14 @@ const ScopeNotificationSettings *MessagesManager::get_scope_notification_setting } DialogNotificationSettings *MessagesManager::get_dialog_notification_settings(DialogId dialog_id, bool force) { - auto dialog = get_dialog_force(dialog_id); - if (dialog == nullptr) { + auto d = get_dialog_force(dialog_id); + if (d == nullptr) { return nullptr; } if (!force && !have_input_peer(dialog_id, AccessRights::Read)) { return nullptr; } - return &dialog->notification_settings; + return &d->notification_settings; } ScopeNotificationSettings *MessagesManager::get_scope_notification_settings(NotificationSettingsScope scope) { @@ -19350,7 +19350,7 @@ void MessagesManager::on_dialog_bots_updated(DialogId dialog_id, vector } auto d = get_dialog_force(dialog_id); - if (d->reply_markup_message_id == MessageId()) { + if (d == nullptr || d->reply_markup_message_id == MessageId()) { return; } const Message *m = get_message_force(d, d->reply_markup_message_id); @@ -20803,7 +20803,7 @@ MessagesManager::Message *MessagesManager::on_get_message_from_database(DialogId return nullptr; } - // can succeed in private chats + // can succeed in private and group chats get_messages_from_server({FullMessageId{dialog_id, m->message_id}}, Auto()); force_create_dialog(dialog_id, source);