From ae5d6c6f95a75bd7224d2d312e2f2291ba5de574 Mon Sep 17 00:00:00 2001
From: Tian L <60599517+tian-lt@users.noreply.github.com>
Date: Fri, 11 Jun 2021 19:34:59 +0800
Subject: [PATCH] fixes: calculator doesn't remember its previous mode (#1580)

---
 src/Calculator/Views/MainPage.xaml.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Calculator/Views/MainPage.xaml.cs b/src/Calculator/Views/MainPage.xaml.cs
index b4afa348..9893b7c4 100644
--- a/src/Calculator/Views/MainPage.xaml.cs
+++ b/src/Calculator/Views/MainPage.xaml.cs
@@ -134,13 +134,11 @@ namespace CalculatorApp
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             ViewMode initialMode = ViewMode.Standard;
-            if (e.Parameter != null)
+
+            string stringParameter = (e.Parameter as string);
+            if (!string.IsNullOrEmpty(stringParameter))
             {
-                string stringParameter = (e.Parameter as string);
-                if (!string.IsNullOrEmpty(stringParameter))
-                {
-                    initialMode = (ViewMode)Convert.ToInt32(stringParameter);
-                }
+                initialMode = (ViewMode)Convert.ToInt32(stringParameter);
             }
             else
             {