From 578b653c4e83cd67ceb2d8f6ce86aff76caf57c2 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 20 Feb 2024 15:46:01 +0800
Subject: [PATCH] Fix bug

---
 app/src/main/java/com/fongmi/android/tv/bean/History.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/bean/History.java b/app/src/main/java/com/fongmi/android/tv/bean/History.java
index 8581da0ef..7f57f812c 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/History.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/History.java
@@ -272,7 +272,8 @@ public class History {
 
     private void merge(List<History> items, boolean force) {
         for (History item : items) {
-            if (!force && (getKey().equals(item.getKey()) || Math.abs(item.getDuration() - getDuration()) > 10 * 60 * 1000)) continue;
+            if (getDuration() > 0 && item.getDuration() > 0 && Math.abs(getDuration() - item.getDuration()) > 10 * 60 * 1000) continue;
+            if (!force && getKey().equals(item.getKey())) continue;
             checkParam(item);
             item.delete();
         }