From 155353f0eefe75c1337832e20c174bea1ddac729 Mon Sep 17 00:00:00 2001
From: Colin Lee <mncolinlee@gmail.com>
Date: Mon, 13 May 2019 10:59:05 -0500
Subject: [PATCH] For #2449: App crashes when switching themes (#2450)

---
 .../org/mozilla/fenix/home/HomeFragment.kt    | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 953298e08..be849e957 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -167,17 +167,20 @@ class HomeFragment : Fragment(), CoroutineScope {
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        val state = sessionControlComponent.stateObservable.blockingFirst()
-        outState.putParcelableArrayList(
-            KEY_TABS,
-            ArrayList(state.tabs)
-        )
-        outState.putParcelableArrayList(
-            KEY_COLLECTIONS,
-            ArrayList(state.collections)
-        )
-        val modeInt = if (state.mode is Mode.Private) 0 else 1
-        outState.putInt(KEY_MODE, modeInt)
+        // This can get called before onCreateView, before the component is defined
+        view?.let {
+            val state = sessionControlComponent.stateObservable.blockingFirst()
+            outState.putParcelableArrayList(
+                KEY_TABS,
+                ArrayList(state.tabs)
+            )
+            outState.putParcelableArrayList(
+                KEY_COLLECTIONS,
+                ArrayList(state.collections)
+            )
+            val modeInt = if (state.mode is Mode.Private) 0 else 1
+            outState.putInt(KEY_MODE, modeInt)
+        }
     }
 
     override fun onViewStateRestored(savedInstanceState: Bundle?) {