Handle a null bundle which actually usually in the place

anaisbetts · anaisbetts · commit cdc64d95b733 · 2014-05-23T16:20:36.000-07:00
diff --git a/ReactiveUI/Android/BundleSuspensionDriver.cs b/ReactiveUI/Android/BundleSuspensionDriver.cs
@@ -21,9 +21,14 @@ public BundleSuspensionDriver()
         public IObservable<object> LoadState()
         {
             try {
-                return Observable.Return(JsonConvert.DeserializeObject(
-                    AutoSuspendActivityHelper.LatestBundle.GetString("__state"),
-                    SerializerSettings));
+                // NB: Sometimes OnCreate gives us a null bundle
+                if (AutoSuspendActivityHelper.LatestBundle == null) {
+                    return Observable.Return(default(object));
+                }
+
+                var ret = JsonConvert.DeserializeObject(
+                    AutoSuspendActivityHelper.LatestBundle.GetString("__state"), SerializerSettings);
+                return Observable.Return(ret);
             } catch (Exception ex) {
                 return Observable.Throw<object>(ex);
             }
