From cf40f92cd53831534359d4b32fcf7515e23549f8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 8 Jun 2020 09:56:09 +0300
Subject: [PATCH] Fixed crash in rescheduling of scheduled until online
 messages.

Fixed #8016.
---
 .../SourceFiles/history/view/history_view_context_menu.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index a443315f0..b8ec2414a 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -430,12 +430,17 @@ bool AddRescheduleMessageAction(
 			? SendMenuType::ScheduledToUser
 			: SendMenuType::Scheduled;
 
+		using S = Data::ScheduledMessages;
+		const auto date = (item->date() == S::kScheduledUntilOnlineTimestamp)
+			? HistoryView::DefaultScheduleTime()
+			: item->date() + 600;
+
 		Ui::show(
 			HistoryView::PrepareScheduleBox(
 				&request.navigation->session(),
 				sendMenuType,
 				callback,
-			item->date() + 600),
+				date),
 			Ui::LayerOption::KeepOther);
 	});
 	return true;