Merge pull request #22609 from ksooo/video-music-fix-playlist-order

[video][music] Fix playlist item order. …
xbmc · Jan 29, 2023 · 16431ec · 16431ec
2 parents 0e7541d + 87786c7
commit 16431ec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/xbmc/music/MusicUtils.cpp b/xbmc/music/MusicUtils.cpp
@@ -553,7 +553,11 @@ void CAsyncGetItemsForPlaylist::GetItemsForPlaylist(const std::shared_ptr<CFileI
           fileFormatter.FormatLabels(i.get());
       }
 
-      const SortDescription sortDesc = GetSortDescription(*state, items);
+      SortDescription sortDesc;
+      if (CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() == WINDOW_MUSIC_NAV)
+        sortDesc = state->GetSortMethod();
+      else
+        sortDesc = GetSortDescription(*state, items);
 
       if (sortDesc.sortBy == SortByLabel)
         items.ClearSortState();

diff --git a/xbmc/video/VideoUtils.cpp b/xbmc/video/VideoUtils.cpp
@@ -173,7 +173,11 @@ void CAsyncGetItemsForPlaylist::GetItemsForPlaylist(const std::shared_ptr<CFileI
           fileFormatter.FormatLabels(i.get());
       }
 
-      const SortDescription sortDesc = GetSortDescription(*state, items);
+      SortDescription sortDesc;
+      if (CServiceBroker::GetGUI()->GetWindowManager().GetActiveWindow() == viewStateWindowId)
+        sortDesc = state->GetSortMethod();
+      else
+        sortDesc = GetSortDescription(*state, items);
 
       if (sortDesc.sortBy == SortByLabel)
         items.ClearSortState();