Merge branch 'main' of https://github.com/0auBSQ/OpenTaiko

FDK/src/04.Graphics/CVideoDecoder.cs

@@ -78,6 +78,7 @@ namespace FDK
 
 		public void Dispose()
 		{
+			bDrawing = false;
             close = true;
 			cts?.Cancel();
 			while (DS != DecodingState.Stopped) ;
@@ -102,6 +103,8 @@ namespace FDK
 			CTimer.Reset();
 			CTimer.Resume();
 			this.bPlaying = true;
+            bDrawing = true;
+
         }
 
 		public void PauseControl()
@@ -122,6 +125,7 @@ namespace FDK
 		{
 			CTimer.Pause();
 			this.bPlaying = false;
+			bDrawing = false;
         }
 
 		public void InitRead()
@@ -329,6 +333,7 @@ namespace FDK
 
 		//for play
 		public bool bPlaying { get; private set; } = false;
+        public bool bDrawing { get; private set; } = false;
         private CTimer CTimer;
 		private AVRational Framerate;
 		private CTexture lastTexture;

OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs

@@ -391,10 +391,13 @@ namespace TJAPlayer3
 			}
 			else
 			{
-				this.rCurrentlySelectedSong.rParentNode.bIsOpenFolder = false;
 				// Reindex the parent node
-				this.rCurrentlySelectedSong.rParentNode.Openindex = rCurrentlySelectedSong.rParentNode.list子リスト.IndexOf(this.rCurrentlySelectedSong);
+				List<CSongListNode> currentSongList = flattenList(TJAPlayer3.Songs管理.list曲ルート, true);
+                this.rCurrentlySelectedSong.rParentNode.Openindex = currentSongList.IndexOf(this.rCurrentlySelectedSong) - currentSongList.IndexOf(this.rCurrentlySelectedSong.rParentNode.list子リスト[0]);
+                this.rCurrentlySelectedSong.rParentNode.bIsOpenFolder = false;
                 tChangeSong(-this.rCurrentlySelectedSong.rParentNode.Openindex);
+
+
             }
 
 			this.t現在選択中の曲を元に曲バーを再構成する();

OpenTaiko/src/Stages/07.Game/CAct演奏AVI.cs

@@ -46,7 +46,7 @@ namespace TJAPlayer3
 		{
 			if ( !base.IsDeActivated)
 			{
-				if (this.rVD == null)
+				if (this.rVD == null || !rVD.bDrawing)
 					return 0;
 					
 				this.rVD.GetNowFrame(ref this.tx描画用);

OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs

@@ -7,6 +7,7 @@ using FDK;
 using FDK.ExtensionMethods;
 using TJAPlayer3;
 using System.Linq;
+using Silk.NET.Core;
 
 namespace TJAPlayer3
 {
@@ -5576,6 +5577,7 @@ namespace TJAPlayer3
                         {
                             this.actAVI.Seek(0);
                         }
+                        break;
                     } 
                 }
             }