Don't ignore Medley Tags

Vocaluxe · Dec 31, 2014 · be8fb53 · be8fb53
1 parent 61e275a
commit be8fb53
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/VocaluxeLib/Songs/CSong.cs b/VocaluxeLib/Songs/CSong.cs
@@ -402,15 +402,15 @@ private List<SSeries> _GetSeries()
             return series;
         }
 
-        private void _FindRefrain()
+        private void _CalcMedley()
         {
             if (IsDuet)
             {
                 Medley.Source = EDataSource.None;
                 return;
             }
 
-            if (!_CalculateMedley)
+            if (!_CalculateMedley || Medley.Source != EDataSource.None)
                 return;
 
             List<SSeries> series = _GetSeries();
@@ -458,14 +458,16 @@ private void _FindRefrain()
                     Medley.FadeOutTime = CBase.Settings.GetDefaultMedleyFadeOutTime();
                 }
             }
+        }
 
-            if (Preview.Source == EDataSource.None)
+        private void _CheckPreview()
+        {
+            if (Preview.Source != EDataSource.None)
+                return;
+            if (Medley.Source != EDataSource.None)
             {
-                if (Medley.Source != EDataSource.None)
-                {
-                    Preview.StartTime = CBase.Game.GetTimeFromBeats(Medley.StartBeat, BPM);
-                    Preview.Source = EDataSource.Calculated;
-                }
+                Preview.StartTime = CBase.Game.GetTimeFromBeats(Medley.StartBeat, BPM);
+                Preview.Source = EDataSource.Calculated;
             }
         }
 

diff --git a/VocaluxeLib/Songs/CSongLoader.cs b/VocaluxeLib/Songs/CSongLoader.cs
@@ -743,7 +743,8 @@ public bool ReadNotes(bool forceReload = false)
                 sr.Dispose();
                 try
                 {
-                    _Song._FindRefrain();
+                    _Song._CalcMedley();
+                    _Song._CheckPreview();
                     _Song._FindShortEnd();
                     _Song.NotesLoaded = true;
                     if (_Song.IsDuet)