From 545915e481dd45400677ee97d4010c423ccb8dd7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 28 Jun 2017 19:16:21 +0300
Subject: [PATCH] Fix name/fwd/reply/viabot info display for media.

---
 Telegram/SourceFiles/history/history_message.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index c25858cb8..89bfa4a86 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -551,7 +551,8 @@ void HistoryMessage::updateMediaInBubbleState() {
 	auto getMediaHasSomethingAbove = [this] {
 		return displayFromName() || displayForwardedFrom() || Has<HistoryMessageReply>() || Has<HistoryMessageVia>();
 	};
-	if (auto entry = Get<HistoryMessageLogEntryOriginal>()) {
+	auto entry = Get<HistoryMessageLogEntryOriginal>();
+	if (entry) {
 		mediaHasSomethingBelow = true;
 		mediaHasSomethingAbove = getMediaHasSomethingAbove();
 		auto entryState = (mediaHasSomethingAbove || !emptyText() || (_media && _media->isDisplayed())) ? MediaInBubbleState::Bottom : MediaInBubbleState::None;
@@ -566,6 +567,9 @@ void HistoryMessage::updateMediaInBubbleState() {
 		return;
 	}
 
+	if (!entry) {
+		mediaHasSomethingAbove = getMediaHasSomethingAbove();
+	}
 	if (!emptyText()) {
 		if (_media->isAboveMessage()) {
 			mediaHasSomethingBelow = true;