diff --git a/DBObj/SongList.cs b/DBObj/SongList.cs index 29f23f2..a218e57 100644 --- a/DBObj/SongList.cs +++ b/DBObj/SongList.cs @@ -92,9 +92,14 @@ namespace DBObj public static void UpdateNextSongLabel() { - VideoPlayerForm.overlayForm.UpdateTopLeftLabel( - (not_played.Count > 0) ? not_played[0].next_song_text() : "目前沒有下一首,請踴躍點歌!!!" - ); + if (Program.room.IsClose()) { + VideoPlayerForm.overlayForm.UpdateTopLeftLabel(" "); + } else { + VideoPlayerForm.overlayForm.UpdateTopLeftLabel( + (not_played.Count > 0) ? not_played[0].next_song_text() : "目前沒有下一首,請踴躍點歌!!!" + ); + } + } public static void clearSong() { diff --git a/OverlayFormObj/OverlayForm.Labels.cs b/OverlayFormObj/OverlayForm.Labels.cs index b14e314..3e255bf 100644 --- a/OverlayFormObj/OverlayForm.Labels.cs +++ b/OverlayFormObj/OverlayForm.Labels.cs @@ -84,9 +84,11 @@ namespace OverlayFormObj Console.WriteLine("Failed to load QR code image after multiple attempts."); return; } - - showQRCode = true; - qrCodeTimer.Start(); + if (Program.room.IsOpen()) { + showQRCode = true; + qrCodeTimer.Start(); + } + Invalidate(); // Trigger a repaint to show the QR code } catch (Exception ex) diff --git a/Program.cs b/Program.cs index 2f05838..b264ea4 100644 --- a/Program.cs +++ b/Program.cs @@ -17,7 +17,7 @@ namespace DualScreenDemo [STAThread] static void Main() { - Console.WriteLine("Server V.1.2.4 202507281600"); + Console.WriteLine("Server V.1.2.5 202507291800"); if (Utils.Env.GetBool("IsCursor", true)) Cursor.Hide(); AppDomain.CurrentDomain.ProcessExit += (s, e) => Cursor.Show(); //Console.WriteLine("正在與中控取得聯繫..."); diff --git a/Room.cs b/Room.cs index 0c62405..da070b5 100644 --- a/Room.cs +++ b/Room.cs @@ -63,7 +63,6 @@ namespace DualScreenDemo { string marqueeMessage = "歡迎使用超級巨星歡唱,與你共度美好時光。"; Color c = Color.White; - setDB(value); if (value.Equals("fire")) { PrimaryForm.Instance.ShowSendOffScreen();