From e87084715d893e2b693406ec03defac28ffc1936 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Mar 2019 15:23:35 +0400
Subject: [PATCH] Fix song / voice playback.

---
 Telegram/SourceFiles/media/audio/media_audio.cpp       | 10 +++-------
 .../SourceFiles/media/player/media_player_instance.cpp |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index 60071db78a..45a01fa167 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -803,9 +803,7 @@ void Mixer::play(
 				emit loaderOnCancel(current->state.id);
 				emit faderOnTimer();
 			}
-			if (type == AudioMsgId::Type::Video) {
-				current->clear();
-			} else {
+			if (type != AudioMsgId::Type::Video) {
 				auto foundCurrent = currentIndex(type);
 				auto index = 0;
 				for (; index != kTogetherLimit; ++index) {
@@ -821,10 +819,8 @@ void Mixer::play(
 			}
 		}
 
-		if (current->state.id != audio) {
-			current->started(); // Clear all previous state.
-			current->state.id = audio;
-		}
+		current->clear(); // Clear all previous state.
+		current->state.id = audio;
 		current->lastUpdateWhen = 0;
 		current->lastUpdatePosition = 0;
 		if (externalData) {
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index 4a068515e9..3955521d82 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -597,7 +597,6 @@ void Instance::emitUpdate(AudioMsgId::Type type, CheckCallback check) {
 		}
 		setCurrent(state.id);
 		if (data->streamed && !data->streamed->info.video.size.isEmpty()) {
-			LOG(("ID: %1, PROGRESS: %1 / %2").arg(state.id.audio()->id).arg(state.position).arg(state.length));
 			data->streamed->progress.updateState(state);
 		}
 		_updatedNotifier.notify(state, true);