From 1d4057f1377ede1774e5ae9698ac1981b7e70187 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 29 Oct 2015 11:27:34 -0400 Subject: [PATCH] fixed forwarding info for forwarded messages --- Telegram/SourceFiles/mainwidget.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 7ff1f875c..057339343 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -537,7 +537,11 @@ void MainWidget::fillForwardingInfo(Text *&from, Text *&text, bool &serviceColor if (_toForward.isEmpty()) return; int32 version = 0; for (SelectedItemSet::const_iterator i = _toForward.cbegin(), e = _toForward.cend(); i != e; ++i) { - version += i.value()->from()->nameVersion; + if (HistoryForwarded *fwd = i.value()->toHistoryForwarded()) { + version += fwd->fromForwarded()->nameVersion; + } else { + version += i.value()->from()->nameVersion; + } } if (version != _toForwardNameVersion) { updateForwardingTexts(); @@ -562,9 +566,9 @@ void MainWidget::updateForwardingTexts() { if (HistoryForwarded *fwd = i.value()->toHistoryForwarded()) { from = fwd->fromForwarded(); } - if (!fromUsersMap.contains(i.value()->from())) { - fromUsersMap.insert(i.value()->from(), true); - fromUsers.push_back(i.value()->from()); + if (!fromUsersMap.contains(from)) { + fromUsersMap.insert(from, true); + fromUsers.push_back(from); } version += i.value()->from()->nameVersion; }