1 files changed, 6 insertions, 0 deletions
diff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java
index 2fb1a5c0c..9e8583075 100644
--- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java
+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedMedia.java
@@ -128,6 +128,9 @@ public class FeedMedia extends FeedFile implements Playable {
         if (other.size > 0) {
             size = other.size;
         }
+        if (other.duration > 0 && duration <= 0) { // Do not overwrite duration that we measured after downloading
+            duration = other.duration;
+        }
         if (other.mime_type != null) {
             mime_type = other.mime_type;
         }
@@ -145,6 +148,9 @@ public class FeedMedia extends FeedFile implements Playable {
         if (other.size > 0 && other.size != size) {
             return true;
         }
+        if (other.duration > 0 && duration <= 0) {
+            return true;
+        }
         return false;
     }