Null exception on platforms that don't support orientation

reactiveui · Jun 1, 2013 · e82358b · e82358b
1 parent da96f40
commit e82358b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ReactiveUI.Platforms/Xaml/RoutedViewHost.cs b/ReactiveUI.Platforms/Xaml/RoutedViewHost.cs
@@ -72,7 +72,7 @@ public RoutedViewHost()
                 .Select(_ => platform.GetOrientation())
                 .DistinctUntilChanged()
                 .StartWith(platform.GetOrientation())
-                .Select(x => x.ToString());
+                .Select(x => x != null ? x.ToString() : default(string));
 
             var vmAndContract = Observable.CombineLatest(
                 this.WhenAnyObservable(x => x.Router.CurrentViewModel),

diff --git a/ReactiveUI.Platforms/Xaml/ViewModelViewHost.cs b/ReactiveUI.Platforms/Xaml/ViewModelViewHost.cs
@@ -68,7 +68,7 @@ public ViewModelViewHost()
                 .Select(_ => platform.GetOrientation())
                 .DistinctUntilChanged()
                 .StartWith(platform.GetOrientation())
-                .Select(x => x.ToString());
+                .Select(x => x != null ? x.ToString() : default(string));
 
             vmAndContract.Subscribe(x => {
                 if (x.ViewModel == null) {