From e943b4ed097a6be52a768c7534f7ceb565c3c42d Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Wed, 2 Nov 2022 20:43:31 -0400
Subject: [PATCH] Fix sorting and filtering for grouping library

---
 .../tachiyomi/ui/library/LibraryPresenter.kt     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index c26f1739d..b8c8b612a 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -213,12 +213,20 @@ class LibraryPresenter(
          */
         if (librarySubscription == null || librarySubscription!!.isCancelled) {
             librarySubscription = presenterScope.launchIO {
-                combine(getLibraryFlow(), getTracksPerManga.subscribe(), filterChanges /* SY --> */, groupChanges/* SY <-- */) { library, tracks, _, _ ->
+                combine(
+                    getLibraryFlow(),
+                    getTracksPerManga.subscribe(),
+                    filterChanges,
+                    // SY -->
+                    groupChanges,
+                    libraryPreferences.librarySortingMode().changes(),
+                    // SY <--
+                ) { library, tracks, _, _, _ ->
                     library.mangaMap
-                        .applyFilters(tracks)
-                        .applySort(library.categories)
                         // SY -->
-                        .applyGrouping(library.categories)
+                        .applyGrouping(library.categories).let {
+                            it.copy(mangaMap = it.mangaMap.applyFilters(tracks).applySort(it.categories))
+                        }
                     // SY <--
                 }
                     .collectLatest {