From e82426399278beff13d97decb41d88242d510f0c Mon Sep 17 00:00:00 2001
From: youzi-2333 <youzi5201086@163.com>
Date: Thu, 4 Jul 2024 15:57:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?:children=5Fcrossing:=20=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80=E9=A6=96=E9=9F=B3=E4=B9=90=E6=97=B6=E5=8F=B3=E9=94=AE?=
 =?UTF-8?q?=E9=87=8D=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plain Craft Launcher 2/Modules/ModMusic.vb | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/Plain Craft Launcher 2/Modules/ModMusic.vb b/Plain Craft Launcher 2/Modules/ModMusic.vb
index 8377aef..c4bcdce 100644
--- a/Plain Craft Launcher 2/Modules/ModMusic.vb	
+++ b/Plain Craft Launcher 2/Modules/ModMusic.vb	
@@ -1,4 +1,6 @@
-Public Module ModMusic
+Imports System.Net
+
+Public Module ModMusic
 
 #Region "播放列表"
 
@@ -74,11 +76,19 @@
                             If MusicState = MusicStates.Pause Then
                                 FrmMain.BtnExtraMusic.Logo = Logo.IconPlay
                                 FrmMain.BtnExtraMusic.LogoScale = 0.8
-                                If MusicAllList.Count > 1 Then ToolTipText += vbCrLf & "左键播放，右键播放下一曲。"
+                                If MusicAllList.Count > 1 Then
+                                    ToolTipText += vbCrLf & "左键播放，右键播放下一曲。"
+                                Else
+                                    ToolTipText += vbCrLf & "左键播放，右键从头重新播放。"
+                                End If
                             Else
                                 FrmMain.BtnExtraMusic.Logo = Logo.IconMusic
                                 FrmMain.BtnExtraMusic.LogoScale = 1
-                                If MusicAllList.Count > 1 Then ToolTipText += vbCrLf & "左键暂停，右键播放下一曲。"
+                                If MusicAllList.Count > 1 Then
+                                    ToolTipText += vbCrLf & "左键暂停，右键播放下一曲。"
+                                Else
+                                    ToolTipText += vbCrLf & "左键暂停，右键从头重新播放。"
+                                End If
                             End If
                             FrmMain.BtnExtraMusic.ToolTip = ToolTipText
                             ToolTipService.SetVerticalOffset(FrmMain.BtnExtraMusic, If(ToolTipText.Contains(vbLf), 10, 16))
@@ -115,7 +125,10 @@
     ''' </summary>
     Public Sub MusicControlNext()
         If MusicAllList.Count = 1 Then
-            Hint("播放列表中仅有一首歌曲！")
+            'Hint("播放列表中仅有一首歌曲！")
+            MusicStartPlay(MusicCurrent)
+            Hint("重新播放：" & GetFileNameFromPath(MusicCurrent), HintType.Finish)
+            MusicRefreshUI()
         Else
             Dim Address As String = DequeueNextMusicAddress()
             MusicStartPlay(Address)

From fca3a2cbb5dad6be2659b9aa47c16cb40360189a Mon Sep 17 00:00:00 2001
From: youzi-2333 <youzi5201086@163.com>
Date: Thu, 4 Jul 2024 15:58:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E5=88=A0=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=20Import=20=E2=80=A6=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plain Craft Launcher 2/Modules/ModMusic.vb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Plain Craft Launcher 2/Modules/ModMusic.vb b/Plain Craft Launcher 2/Modules/ModMusic.vb
index c4bcdce..ef89bf3 100644
--- a/Plain Craft Launcher 2/Modules/ModMusic.vb	
+++ b/Plain Craft Launcher 2/Modules/ModMusic.vb	
@@ -1,6 +1,4 @@
-Imports System.Net
-
-Public Module ModMusic
+Public Module ModMusic
 
 #Region "播放列表"