fixed forwarding info for forwarded messages

This commit is contained in:
John Preston 2015-10-29 11:27:34 -04:00
parent 89a3d6b505
commit 1d4057f137
1 changed files with 8 additions and 4 deletions

View File

@ -537,7 +537,11 @@ void MainWidget::fillForwardingInfo(Text *&from, Text *&text, bool &serviceColor
if (_toForward.isEmpty()) return; if (_toForward.isEmpty()) return;
int32 version = 0; int32 version = 0;
for (SelectedItemSet::const_iterator i = _toForward.cbegin(), e = _toForward.cend(); i != e; ++i) { 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) { if (version != _toForwardNameVersion) {
updateForwardingTexts(); updateForwardingTexts();
@ -562,9 +566,9 @@ void MainWidget::updateForwardingTexts() {
if (HistoryForwarded *fwd = i.value()->toHistoryForwarded()) { if (HistoryForwarded *fwd = i.value()->toHistoryForwarded()) {
from = fwd->fromForwarded(); from = fwd->fromForwarded();
} }
if (!fromUsersMap.contains(i.value()->from())) { if (!fromUsersMap.contains(from)) {
fromUsersMap.insert(i.value()->from(), true); fromUsersMap.insert(from, true);
fromUsers.push_back(i.value()->from()); fromUsers.push_back(from);
} }
version += i.value()->from()->nameVersion; version += i.value()->from()->nameVersion;
} }