From 964b10555686f5ceb65f367ee2ff6bc0689f4b37 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 17 Jan 2023 16:13:16 +0800
Subject: [PATCH 1/2] Fix track bug

---
 .../java/com/fongmi/android/tv/ui/activity/DetailActivity.java  | 1 -
 .../com/fongmi/android/tv/ui/custom/TrackSelectionDialog.java   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index d4bfbc268..694859200 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -728,7 +728,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
 
     @Override
     public void onTrackClick(Track item) {
-        item.setPlayer(mPlayers.getPlayer());
         item.setKey(getHistoryKey());
         item.save();
     }
diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/TrackSelectionDialog.java b/app/src/main/java/com/fongmi/android/tv/ui/custom/TrackSelectionDialog.java
index eff3f280d..0ac9e169e 100644
--- a/app/src/main/java/com/fongmi/android/tv/ui/custom/TrackSelectionDialog.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/TrackSelectionDialog.java
@@ -90,6 +90,7 @@ public final class TrackSelectionDialog implements TrackAdapter.OnClickListener
             for (int j = 0; j < trackGroup.length; j++) {
                 Track item = new Track(type, provider.getTrackName(trackGroup.getTrackFormat(j)));
                 item.setSelected(trackGroup.isTrackSelected(j));
+                item.setPlayer(player.getPlayer());
                 item.setGroup(i);
                 item.setTrack(j);
                 items.add(item);
@@ -104,6 +105,7 @@ public final class TrackSelectionDialog implements TrackAdapter.OnClickListener
             IjkTrackInfo trackInfo = trackInfos[i];
             if (trackInfo.getTrackType() != type) continue;
             Track item = new Track(type, provider.getTrackName(trackInfo));
+            item.setPlayer(player.getPlayer());
             item.setSelected(track == i);
             item.setTrack(i);
             items.add(item);