handle null reference exception

diff --git a/SettingCore/GadgetNavigation.cs b/SettingCore/GadgetNavigation.cs
index 3a131359c39ea6db74217003f745d8c97a99809e..264aaa2da36c574953e68b017dcf005cd6cfe41e 100644 (file)
--- a/SettingCore/GadgetNavigation.cs
+++ b/SettingCore/GadgetNavigation.cs
@@ -65,7 +65,16 @@ namespace SettingCore
             else
             {
                 SetFullScreenMode(false);
-                NUIApplication.GetDefaultWindow().GetDefaultNavigator().PopWithTransition();
+
+                try
+                {
+                    // CreateTransitions issue
+                    NUIApplication.GetDefaultWindow().GetDefaultNavigator().PopWithTransition();
+                }
+                catch (Exception ex)
+                {
+                    Logger.Warn($"{ex.Message}");
+                }
             }
         }
 
@@ -103,7 +112,16 @@ namespace SettingCore
                         ThemeChangeSensitive = true,
                     };
 
-                    NUIApplication.GetDefaultWindow().GetDefaultNavigator().PushWithTransition(contentPage);
+                    try
+                    {
+                        // CreateTransitions issue
+                        NUIApplication.GetDefaultWindow().GetDefaultNavigator().PushWithTransition(contentPage);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Warn($"{ex.Message}");
+                    }
+
                     gadgetPages.Add(contentPage, gadget);
                     return;
                 }