summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hennen <TomHennen@users.noreply.github.com>2016-03-22 17:28:00 -0400
committerTom Hennen <TomHennen@users.noreply.github.com>2016-03-22 17:28:00 -0400
commit7aa414d437d90b16d2022fbbacb952f837ef6993 (patch)
tree0643a635567406965a198f602a565945b45cbfd8
parent35a3734da8504dd03227ba6e2e00b3c7a3cb29ef (diff)
parent3adb63fbc7d9e8a6456dbb5c1ccbf17e1ba16524 (diff)
downloadAntennaPod-7aa414d437d90b16d2022fbbacb952f837ef6993.zip
Merge pull request #1802 from mfietz/issue/1780-position
When retrieving position of current episode, regard position 0 as valid
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
index 15a96588c..3ab26eb22 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
@@ -587,10 +587,8 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
|| playerStatus == PlayerStatus.PREPARED
|| playerStatus == PlayerStatus.SEEKING) {
retVal = mediaPlayer.getCurrentPosition();
- if(retVal <= 0 && media != null && media.getPosition() > 0) {
- retVal = media.getPosition();
- }
- } else if (media != null && media.getPosition() > 0) {
+ }
+ if (retVal <= 0 && media != null && media.getPosition() >= 0) {
retVal = media.getPosition();
}