diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index a1b97298cb..993a5f0941 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -647,16 +647,17 @@ HistoryWidget::HistoryWidget( ) | rpl::filter([=](const Api::SendAction &action) { return (action.history == _history); }) | rpl::start_with_next([=](const Api::SendAction &action) { + const auto lastKeyboardUsed = lastForceReplyReplied(FullMsgId( + action.history->channelId(), + action.replyTo)); if (action.options.scheduled) { + cancelReply(lastKeyboardUsed); crl::on_main(this, [=, history = action.history]{ controller->showSection( HistoryView::ScheduledMemento(history)); }); } else { fastShowAtEnd(action.history); - const auto lastKeyboardUsed = lastForceReplyReplied(FullMsgId( - action.history->channelId(), - action.replyTo)); if (cancelReply(lastKeyboardUsed) && !action.clearDraft) { onCloudDraftSave(); }