From 7ef8f0454b61429a1e4e9d306535f23b2fca5ba7 Mon Sep 17 00:00:00 2001
From: aAbed <39409020+TheAabedKhan@users.noreply.github.com>
Date: Sat, 29 Jun 2024 18:25:20 +0545
Subject: [PATCH] fix: Select previously applied patches when loading patch
 selection (#1865)

---
 .../patches_selector_viewmodel.dart                 | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/ui/views/patches_selector/patches_selector_viewmodel.dart b/lib/ui/views/patches_selector/patches_selector_viewmodel.dart
index e88cafee..89fa0617 100644
--- a/lib/ui/views/patches_selector/patches_selector_viewmodel.dart
+++ b/lib/ui/views/patches_selector/patches_selector_viewmodel.dart
@@ -301,9 +301,16 @@ class PatchesSelectorViewModel extends BaseViewModel {
 
   Future<void> loadSelectedPatches(BuildContext context) async {
     if (_managerAPI.isPatchesChangeEnabled()) {
-      final List<String> selectedPatches = await _managerAPI.getSelectedPatches(
-        locator<PatcherViewModel>().selectedApp!.packageName,
-      );
+      final List<String>? appliedPatches = _managerAPI
+          .getPatchedApps()
+          .firstWhereOrNull(
+            (app) => app.packageName == selectedApp!.packageName,
+          )
+          ?.appliedPatches;
+      final List<String> selectedPatches = appliedPatches ??
+          await _managerAPI.getSelectedPatches(
+            selectedApp!.packageName,
+          );
       if (selectedPatches.isNotEmpty) {
         this.selectedPatches.clear();
         this.selectedPatches.addAll(