diff --git a/PrimaryFormParts/CategorySearch/PrimaryForm.CategorySearch.cs b/PrimaryFormParts/CategorySearch/PrimaryForm.CategorySearch.cs index 3d24677..77e01ef 100644 --- a/PrimaryFormParts/CategorySearch/PrimaryForm.CategorySearch.cs +++ b/PrimaryFormParts/CategorySearch/PrimaryForm.CategorySearch.cs @@ -254,7 +254,7 @@ namespace DualScreenDemo } private string SetQueryforSQL(string contains){ - string query = $"SELECT * FROM song_library_cache WHERE situation LIKE '%{contains}%' ORDER BY `song_id` DESC"; + string query = $"SELECT * FROM song_library_cache WHERE situations LIKE '%{contains}%' ORDER BY `song_id` DESC"; return query; } } diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs index a2d5f4b..b805fb9 100644 --- a/PrimaryFormParts/PrimaryForm.cs +++ b/PrimaryFormParts/PrimaryForm.cs @@ -2012,6 +2012,8 @@ namespace DualScreenDemo /// private void ShouYeButton_Click(object sender, EventArgs e) { + if(currentSongList == playedSongsHistory) + return; autoRefreshTimer.Stop(); // 停止自动刷新 FindFirstNonEmptyText(inputBoxZhuYinSingers , inputBoxZhuYinSongs diff --git a/TCPServer.cs b/TCPServer.cs index f3a5e83..a3a0433 100644 --- a/TCPServer.cs +++ b/TCPServer.cs @@ -152,7 +152,7 @@ namespace DualScreenDemo ); VideoPlayerForm.publicPlaylist = new List(); VideoPlayerForm.playingSongList = new List(); - + PrimaryForm.playedSongsHistory = new List(); if (VideoPlayerForm.Instance.currentPlayingSong != null) { VideoPlayerForm.playingSongList.Add(VideoPlayerForm.Instance.currentPlayingSong);