RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed info display in media in non-group chats. 

Version 1.0.8 introduced a regression in displaying forwarded,
reply and via @bot information in photo, video, GIFs and locations.
This commit is contained in:
John Preston 2017-02-11 10:55:43 +03:00
parent e922e5be39
commit d3420b6a92
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/history/history_media_types.h
View File

@ -162,7 +162,10 @@ public:
return true;
}
if (auto message = _parent->toHistoryMessage()) {
return message->displayFromName();
return message->viaBot()
|| message->Has<HistoryMessageForwarded>()
|| message->Has<HistoryMessageReply>()
|| message->displayFromName();
}
return false;
}
@ -249,7 +252,10 @@ public:
return true;
}
if (auto message = _parent->toHistoryMessage()) {
return message->displayFromName();
return message->viaBot()
|| message->Has<HistoryMessageForwarded>()
|| message->Has<HistoryMessageReply>()
|| message->displayFromName();
}
return false;
}
@ -503,7 +509,10 @@ public:
return true;
}
if (auto message = _parent->toHistoryMessage()) {
return message->displayFromName();
return message->viaBot()
|| message->Has<HistoryMessageForwarded>()
|| message->Has<HistoryMessageReply>()
|| message->displayFromName();
}
return false;
}
@ -904,7 +913,10 @@ public:
return true;
}
if (auto message = _parent->toHistoryMessage()) {
return message->displayFromName();
return message->viaBot()
|| message->Has<HistoryMessageForwarded>()
|| message->Has<HistoryMessageReply>()
|| message->displayFromName();
}
return false;
}