From 5ddd093273aa9288b1402faba51616c864967549 Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Tue, 26 Aug 2025 16:31:53 +0800 Subject: [PATCH] =?UTF-8?q?2508261630=20=E5=B7=B2=E9=BB=9E=E6=AD=8C?= =?UTF-8?q?=E6=9B=B2=E5=88=AA=E9=99=A4=E5=8A=9F=E8=83=BD=E9=82=8F=E8=BC=AF?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DBObj/SongList.cs | 10 +++++++--- PrimaryFormParts/PrimaryForm.VodScreen.cs | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/DBObj/SongList.cs b/DBObj/SongList.cs index 08e41fb..40f7e65 100644 --- a/DBObj/SongList.cs +++ b/DBObj/SongList.cs @@ -102,9 +102,13 @@ namespace DBObj public static void Cancel(SongData song) { - not_played.Remove(song); - song.SetState(PlayState.Skipped); - played.Add(song); + if (song.GetState() == PlayState.NotPlayed) + { + not_played.Remove(song); + song.SetState(PlayState.Skipped); + played.Add(song); + } + } public static void Insert(SongData song) diff --git a/PrimaryFormParts/PrimaryForm.VodScreen.cs b/PrimaryFormParts/PrimaryForm.VodScreen.cs index 3e05bda..8f87b1a 100644 --- a/PrimaryFormParts/PrimaryForm.VodScreen.cs +++ b/PrimaryFormParts/PrimaryForm.VodScreen.cs @@ -104,7 +104,7 @@ namespace DualScreenDemo if (isOnOrderedSongsPage) { SetVodScreenPictureBoxAndButtonsVisibility(false); - if(currentSelectedSong.GetState()!=PlayState.Playing)SongList.Cancel(currentSelectedSong); + SongList.Cancel(currentSelectedSong); orderedSongsButton.PerformClick(); } else @@ -129,7 +129,7 @@ namespace DualScreenDemo /*var selectedSongs = allSongs.Where(song => song.ArtistA == currentSelectedSong.ArtistA) .OrderByDescending(song => song.AddedTime) .ToList();*/ - + isOnOrderedSongsPage = false; UpdateSongList(selectedSongs); SetVodScreenPictureBoxAndButtonsVisibility(false); }