From 2261b13ba36d53fafd321a236180d22ba2a631ca Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Mon, 28 Sep 2020 15:58:42 +0900
Subject: [PATCH] albums: fixed pinning after renaming

---
 .../filter_grids/common/chip_action_delegate.dart      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/widgets/filter_grids/common/chip_action_delegate.dart b/lib/widgets/filter_grids/common/chip_action_delegate.dart
index 56b518752..d20e479de 100644
--- a/lib/widgets/filter_grids/common/chip_action_delegate.dart
+++ b/lib/widgets/filter_grids/common/chip_action_delegate.dart
@@ -127,16 +127,18 @@ class AlbumChipActionDelegate extends ChipActionDelegate with FeedbackMixin, Per
         } else {
           showFeedback(context, 'Done!');
         }
+        final pinned = settings.pinnedFilters.contains(filter);
         await source.updateAfterMove(
           selection: selection,
           copy: false,
           destinationAlbum: destinationAlbum,
           movedOps: movedOps,
         );
-        final newFilter = AlbumFilter(destinationAlbum, source.getUniqueAlbumName(destinationAlbum));
-        settings.pinnedFilters = settings.pinnedFilters
-          ..remove(filter)
-          ..add(newFilter);
+        // repin new album after obsolete album got removed and unpinned
+        if (pinned) {
+          final newFilter = AlbumFilter(destinationAlbum, source.getUniqueAlbumName(destinationAlbum));
+          settings.pinnedFilters = settings.pinnedFilters..add(newFilter);
+        }
       },
     );
   }