From 3a148c73ac58170ac5cd9581aad02f4b51f4b9fd Mon Sep 17 00:00:00 2001 From: Ken Swenson Date: Sun, 21 Mar 2021 19:47:17 -0400 Subject: [PATCH] Fix migration due to variable shadowing (#4689) (cherry picked from commit 472ce5a5e4fb7bdc3f52e4db2d68a5749d59fee1) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt --- .../tachiyomi/ui/browse/migration/search/SearchController.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt index af992e650..180de038b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt @@ -109,7 +109,8 @@ class SearchController( return } newManga = manga - val dialog = MigrationDialog(manga, newManga ?: return, this) + val dialog = + MigrationDialog(this.manga ?: return, newManga ?: return, this) dialog.targetController = this dialog.showDialog(router) }