From b9bb0d05c9ea51c7b1e4b9ef1740fe7115a83a93 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Fri, 4 Dec 2020 16:07:38 +0100
Subject: [PATCH] Safety loaded method in ContentPlayerPadContent
---
.../content/pad/ContentPlayerPadContent.scala | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadContent.scala b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadContent.scala
index f2b0f1df..7c26c7c1 100644
--- a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadContent.scala
+++ b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadContent.scala
@@ -20,6 +20,7 @@ import javafx.util.Duration
import java.nio.file.Files
import java.util
+import java.util.Optional
import java.util.stream.Collectors
import scala.jdk.CollectionConverters._
@@ -172,11 +173,13 @@ class ContentPlayerPadContent(val pad: Pad, val `type`: String) extends PadConte
mediaPlayers.isNotEmpty && !mediaPlayers.stream().anyMatch(player => player.mediaPlayer.getStatus == MediaPlayer.Status.UNKNOWN)
}
- override def isLoaded(mediaPath: MediaPath): Boolean = mediaPlayers.stream()
- .filter(item => item.path == mediaPath)
- .findFirst()
- .map(container => container.mediaPlayer.getStatus != MediaPlayer.Status.UNKNOWN)
- .get()
+ override def isLoaded(mediaPath: MediaPath): Boolean = {
+ val loadedOptional: Optional[Boolean] = mediaPlayers.stream()
+ .filter(item => item.path == mediaPath)
+ .findFirst()
+ .map(container => container.mediaPlayer.getStatus != MediaPlayer.Status.UNKNOWN)
+ loadedOptional.orElse(false)
+ }
/**
* Load media files.
--
GitLab