From 3c6596b31cde6c95a3ab1caa2657c0bb498523bf Mon Sep 17 00:00:00 2001
From: Kevin Rushforth <kcr@openjdk.org>
Date: Wed, 15 Sep 2021 20:50:46 +0000
Subject: [PATCH] 8268718: [macos] Video stops, but audio continues to play
 when stopTime is reached

Backport-of: 0c98d9608611aa2378b38604e2528935c94e84ae
---
 .../main/native/jfxmedia/platform/osx/avf/AVFMediaPlayer.mm  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/javafx.media/src/main/native/jfxmedia/platform/osx/avf/AVFMediaPlayer.mm b/modules/javafx.media/src/main/native/jfxmedia/platform/osx/avf/AVFMediaPlayer.mm
index 4b3a55a67c..07302efd1a 100644
--- a/modules/javafx.media/src/main/native/jfxmedia/platform/osx/avf/AVFMediaPlayer.mm
+++ b/modules/javafx.media/src/main/native/jfxmedia/platform/osx/avf/AVFMediaPlayer.mm
@@ -333,6 +333,9 @@ - (double) currentTime
 - (void) setCurrentTime:(double)time
 {
     [self.player seekToTime:CMTimeMakeWithSeconds(time, 1)];
+    if (previousPlayerState == kPlayerState_FINISHED) {
+        [self play];
+    }
 }
 
 - (BOOL) mute {
@@ -402,6 +405,8 @@ - (void) stop {
 }
 
 - (void) finish {
+    [self.player pause];
+    [self setPlayerState:kPlayerState_FINISHED];
 }
 
 - (void) dispose {