1 files changed, 16 insertions, 7 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
index a4099bf94..7988526d9 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
@@ -1092,13 +1092,22 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
         if (seekLatch != null) {
             seekLatch.countDown();
         }
-        playerLock.lock();
-        if (playerStatus == PlayerStatus.PLAYING) {
-            callback.onPlaybackStart(media, getPosition());
-        }
-        if (playerStatus == PlayerStatus.SEEKING) {
-            setPlayerStatus(statusBeforeSeeking, media, getPosition());
+
+        Runnable r = () -> {
+            playerLock.lock();
+            if (playerStatus == PlayerStatus.PLAYING) {
+                callback.onPlaybackStart(media, getPosition());
+            }
+            if (playerStatus == PlayerStatus.SEEKING) {
+                setPlayerStatus(statusBeforeSeeking, media, getPosition());
+            }
+            playerLock.unlock();
+        };
+
+        if (useCallerThread) {
+            r.run();
+        } else {
+            executor.submit(r);
         }
-        playerLock.unlock();
     }
 }