From 82979afb48defa38e5cd2f8f6c545f0942e7ef99 Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Tue, 25 Feb 2020 14:02:27 -0800 Subject: [PATCH] For #8743: Fix baseBrowserFragment crash --- .../org/mozilla/fenix/browser/BaseBrowserFragment.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index a2abb3505..65f0a7afe 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -460,10 +460,12 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session private fun adjustBackgroundAndNavigate(directions: NavDirections) { context?.let { - engineView.captureThumbnail { bitmap -> - viewLifecycleOwner.lifecycleScope.launch { - // isAdded check is necessary because of a bug in viewLifecycleOwner. See AC#3828 - if (!this@BaseBrowserFragment.isAdded) return@launch + viewLifecycleOwner.lifecycleScope.launch { + // isAdded check is necessary because of a bug in viewLifecycleOwner. See AC#3828 + if (!this@BaseBrowserFragment.isAdded) return@launch + + engineView.captureThumbnail { bitmap -> + if (!this@BaseBrowserFragment.isAdded) return@captureThumbnail // If the bitmap is null, the best we can do to reduce the flash is set transparent swipeRefresh.background = bitmap?.toDrawable(it.resources)