From 34fc0a662ca23b09d9b315251d3a0ca1e09313a3 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Thu, 27 May 2021 23:26:12 -0400 Subject: [PATCH] Using lastOrNull in mainactivity to prevent a crash --- app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index efb1972e62..fb2be954c6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -642,7 +642,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi } override fun onBackPressed() { - val sheetController = router.backstack.last().controller as? BottomSheetController + val sheetController = router.backstack.lastOrNull()?.controller as? BottomSheetController if (if (router.backstackSize == 1) !(sheetController?.handleSheetBack() ?: false) else !router.handleBack() ) {