From 2f51919670e569650d1999c35c7a74d374c9685f Mon Sep 17 00:00:00 2001
From: Marco Romano <marcor@element.io>
Date: Fri, 10 Nov 2023 10:45:29 +0100
Subject: [PATCH] Check for the correct media id when ensuring the MediaPlayer
 is ready (#1783)

Just forgot to add this further condition.
---
 .../android/libraries/mediaplayer/impl/MediaPlayerImpl.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/MediaPlayerImpl.kt b/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/MediaPlayerImpl.kt
index 420b01acc7f..66e4e748a56 100644
--- a/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/MediaPlayerImpl.kt
+++ b/libraries/mediaplayer/impl/src/main/kotlin/io/element/android/libraries/mediaplayer/impl/MediaPlayerImpl.kt
@@ -116,7 +116,7 @@ class MediaPlayerImpl @Inject constructor(
         )
         player.prepare()
         // Will throw TimeoutCancellationException if the player is not ready after 1 second.
-        return state.timeout(1.seconds).first { it.isReady }
+        return state.timeout(1.seconds).first { it.isReady && it.mediaId == mediaId }
     }
 
     override fun play() {