Fixed playlist previous/next when moving items

FredTungsten · Jan 11, 2020 · 4a74053 · 4a74053
1 parent 16035a2
commit 4a74053
Showing 1 changed file with 30 additions and 25 deletions.
diff --git a/ScriptPlayer/ScriptPlayer/ViewModels/PlaylistViewModel.cs b/ScriptPlayer/ScriptPlayer/ViewModels/PlaylistViewModel.cs
@@ -102,7 +102,7 @@ private void PlaylistEntriesHaveChanged(bool filesAdded)
             UpdateFilter();
             CommandManager.InvalidateRequerySuggested();
             UpdateTotalDuration();
-            UpdateNextAndPreviousIfNull();
+            UpdateNextAndPrevious();
             OnEntriesChanged(filesAdded);
         }
 
@@ -259,8 +259,22 @@ public bool RepeatSingleFile
 
         private void UpdateNextAndPrevious()
         {
-            PreviousEntry = GetPreviousEntry();
-            NextEntry = GetNextEntry();
+            if(Shuffle)
+                UpdateNextAndPreviousIfNull();
+            else
+            {
+                PreviousEntry = GetPreviousEntry();
+                NextEntry = GetNextEntry();
+            }
+        }
+
+        private void UpdateNextAndPreviousIfNull()
+        {
+            if (NextEntry == null)
+                NextEntry = GetNextEntry();
+
+            if (PreviousEntry == null || PreviousEntry == NextEntry)
+                PreviousEntry = GetPreviousEntry();
         }
 
         public PlaylistEntry SelectedEntry
@@ -631,6 +645,18 @@ private bool CanRemoveSelectedEntry()
             return !SelectionIsEmpty();
         }
 
+        public void Clear()
+        {
+            foreach (var entry in Entries)
+                entry.Removed = true;
+
+            Entries.Clear();
+            _previousEntries.Clear();
+            PreviousEntry = null;
+            NextEntry = null;
+            CommandManager.InvalidateRequerySuggested();
+        }
+
         private void ExecuteRemoveSelectedEntry()
         {
             if (!CanRemoveSelectedEntry())
@@ -808,15 +834,6 @@ public void AddEntries(string[] filenames)
             AddEntries(filenames.Select(fn => new PlaylistEntry(fn)));
         }
 
-        private void UpdateNextAndPreviousIfNull()
-        {
-            if (NextEntry == null)
-                NextEntry = GetNextEntry();
-
-            if (PreviousEntry == null || PreviousEntry == NextEntry)
-                PreviousEntry = GetPreviousEntry();
-        }
-
         public void AddEntries(IEnumerable<PlaylistEntry> entries)
         {
             try
@@ -840,19 +857,7 @@ public void AddEntries(IEnumerable<PlaylistEntry> entries)
                 DeferLoading = false;
             }
         }
-
-        public void Clear()
-        {
-            foreach (var entry in Entries)
-                entry.Removed = true;
-
-            Entries.Clear();
-            _previousEntries.Clear();
-            PreviousEntry = null;
-            NextEntry = null;
-            CommandManager.InvalidateRequerySuggested();
-        }
-
+
         public void SetCurrentEntry(string[] files)
         {
             PlaylistEntry existingEntry = GetEntry(files);