Changeset 12462 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-07-10T01:34:48+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15003 - NPE at JavaFxMediaPlayer.speed

File:

• trunk/src/org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java

@@ -56 +56 @@
 
     @Override
-    public void play(Execute command, State stateChange, URL playingUrl) throws AudioException, IOException {
+    public synchronized void play(Execute command, State stateChange, URL playingUrl) throws AudioException, IOException {
         try {
             final URL url = command.url();
@@ -86 +86 @@
 
     @Override
-    public void pause(Execute command, State stateChange, URL playingUrl) throws AudioException, IOException {
+    public synchronized void pause(Execute command, State stateChange, URL playingUrl) throws AudioException, IOException {
         if (mediaPlayer != null) {
             try {
@@ -103 +103 @@
 
     @Override
-    public double position() {
-        return mediaPlayer.getCurrentTime().toSeconds();
+    public synchronized double position() {
+        return mediaPlayer != null ? mediaPlayer.getCurrentTime().toSeconds() : -1;
     }
 
     @Override
-    public double speed() {
-        return mediaPlayer.getCurrentRate();
+    public synchronized double speed() {
+        return mediaPlayer != null ? mediaPlayer.getCurrentRate() : -1;
     }