From 50097eef9fc7d6631f41b65a9161414cef49986b Mon Sep 17 00:00:00 2001
From: jobobby04 <jobobby04@users.noreply.github.com>
Date: Fri, 17 Apr 2020 01:23:12 -0400
Subject: [PATCH] Fixes for merging from upstream

(cherry picked from commit 5f2eb19ea37ba191d414eee4e8f45f20f1a73e89)
---
 .../ui/migration/manga/design/PreMigrationController.kt   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
index 05b6065dd..71996ea6f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
@@ -77,9 +77,11 @@ class PreMigrationController(bundle: Bundle? = null) : BaseController(bundle), F
                 val bottomSheet = dialog?.findViewById<FrameLayout>(
                     com.google.android.material.R.id.design_bottom_sheet
                 )
-                val behavior: BottomSheetBehavior<*> = BottomSheetBehavior.from(bottomSheet!!)
-                behavior.state = BottomSheetBehavior.STATE_EXPANDED
-                behavior.skipCollapsed = true
+                if (bottomSheet != null) {
+                    val behavior: BottomSheetBehavior<*> = BottomSheetBehavior.from(bottomSheet)
+                    behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                    behavior.skipCollapsed = true
+                }
             }
         }
     }