From 0f94419f6d6fa3352c4d83921bc7197ed9b483bb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 29 Aug 2024 12:46:55 +0300
Subject: [PATCH] Improved fix of crash in video messages playback.

Regression was introduced in ad3e447f08.
---
 Telegram/SourceFiles/media/player/media_player_widget.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp
index 2f33174eb..f45bda81a 100644
--- a/Telegram/SourceFiles/media/player/media_player_widget.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp
@@ -670,6 +670,9 @@ void Widget::updateTimeLabel() {
 void Widget::handleSongChange() {
 	const auto current = instance()->current(_type);
 	const auto document = current.audio();
+	_lastSongFromAnotherSession = document
+		&& (document->session().uniqueId()
+			!= _controller->session().uniqueId());
 	if (!current
 		|| !document
 		|| ((_lastSongId.audio() == document)
@@ -677,8 +680,6 @@ void Widget::handleSongChange() {
 		return;
 	}
 	_lastSongId = current;
-	_lastSongFromAnotherSession = (document->session().uniqueId()
-		!= _controller->session().uniqueId());
 
 	auto textWithEntities = TextWithEntities();
 	if (document->isVoiceMessage() || document->isVideoMessage()) {