diff --git a/app/src/main/java/com/shuwei/dish/match/ui/CookingModeActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/CookingModeActivity.kt
index a99f64e..6f707cb 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/CookingModeActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/CookingModeActivity.kt
@@ -165,15 +165,15 @@ class CookingModeActivity : BaseActivity() {
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         runCatching {
-            val isConfigPage = intent?.getBooleanExtra(IS_CONFIG_PAGE, false) ?: false
+            val isConfigPage = intent.getBooleanExtra(IS_CONFIG_PAGE, false)
             if (isConfigPage) {
                 return
             }
-            val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false
-            val lastDinnerType = intent?.getStringExtra(DINNER_TYPE) ?: "0"
+            //val isCooking = intent.getBooleanExtra(IS_COOKING, false)
+            val lastDinnerType = intent.getStringExtra(DINNER_TYPE) ?: "0"
             if (lastDinnerType == "1" || lastDinnerType == "2" || lastDinnerType == "3") {
                 clearSearchText()
-                fragmentList[lastDinnerType.toInt() - 1].getDishList(1, lastDinnerType)
+                fragmentList.getOrNull(lastDinnerType.toInt() - 1)?.getDishList(1, lastDinnerType)
             }
             when (lastDinnerType) {
                 "1" -> binding.dishRadioGroup.check(R.id.rbBreakfast)