From bca39d98e2c54e55cd304c4839f9d0df8baebdb8 Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Fri, 5 Sep 2025 12:12:29 +0800 Subject: [PATCH] =?UTF-8?q?2509051211=20=E5=88=AA=E9=99=A4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=95=8F=E9=A1=8C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DBObj/SongList.cs | 2 +- PrimaryFormParts/PrimaryForm.VodScreen.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DBObj/SongList.cs b/DBObj/SongList.cs index 40f7e65..1e8ca31 100644 --- a/DBObj/SongList.cs +++ b/DBObj/SongList.cs @@ -102,7 +102,7 @@ namespace DBObj public static void Cancel(SongData song) { - if (song.GetState() == PlayState.NotPlayed) + if (song.GetState() == PlayState.NotPlayed||song.GetState() ==PlayState.InsertPlayback) { not_played.Remove(song); song.SetState(PlayState.Skipped); diff --git a/PrimaryFormParts/PrimaryForm.VodScreen.cs b/PrimaryFormParts/PrimaryForm.VodScreen.cs index dda006c..8ce833a 100644 --- a/PrimaryFormParts/PrimaryForm.VodScreen.cs +++ b/PrimaryFormParts/PrimaryForm.VodScreen.cs @@ -121,6 +121,7 @@ namespace DualScreenDemo { SetVodScreenPictureBoxAndButtonsVisibility(false); SongList.Insert(currentSelectedSong); + if (isOnOrderedSongsPage) orderedSongsButton.PerformClick(); } private void AlbumButton_Click(object sender, EventArgs e)