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

Fix crash in editing message to empty.

This commit is contained in:
John Preston 2019-08-12 11:37:01 +01:00
parent 1e64ba8f29
commit 1139a59818
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Telegram/SourceFiles/history/history_message.cpp
View File

@ -1136,30 +1136,31 @@ void HistoryMessage::setText(const TextWithEntities &textWithEntities) {
}
}
clearIsolatedEmoji();
if (_media && _media->consumeMessageText(textWithEntities)) {
setEmptyText();
} else {
return;
}
clearIsolatedEmoji();
_text.setMarkedText(
st::messageTextStyle,
textWithEntities,
Ui::ItemTextOptions(this));
if (!textWithEntities.text.isEmpty() && _text.isEmpty()) {
// If server has allowed some text that we've trim-ed entirely,
// just replace it with something so that UI won't look buggy.
_text.setMarkedText(
st::messageTextStyle,
textWithEntities,
{ QString::fromUtf8(":-("), EntitiesInText() },
Ui::ItemTextOptions(this));
if (!textWithEntities.text.isEmpty() && _text.isEmpty()) {
// If server has allowed some text that we've trim-ed entirely,
// just replace it with something so that UI won't look buggy.
_text.setMarkedText(
st::messageTextStyle,
{ QString::fromUtf8(":-("), EntitiesInText() },
Ui::ItemTextOptions(this));
} else if (!_media) {
checkIsolatedEmoji();
}
_textWidth = -1;
_textHeight = 0;
} else if (!_media) {
checkIsolatedEmoji();
}
_textWidth = -1;
_textHeight = 0;
}
void HistoryMessage::setEmptyText() {
clearIsolatedEmoji();
_text.setMarkedText(
st::messageTextStyle,
{ QString(), EntitiesInText() },