Merge branch 'master' of https://github.com/hugsy/CFB

hugsy · Feb 9, 2020 · af29ffc · af29ffc
2 parents 836830e + 1818923
commit af29ffc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/GUI/App.xaml.cs b/GUI/App.xaml.cs
@@ -55,10 +55,19 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
 
             if (shell.AppFrame.Content == null)
             {
-                var localSettings = ApplicationData.Current.LocalSettings;
-                var homePageIndex = localSettings.Values["HomePage"]!=null ? (int)localSettings.Values["HomePage"] : 0;
-                var defaultPageName = App.HomePageList[homePageIndex];
-                var defaultPage = Type.GetType($"GUI.Views.{defaultPageName}");
+                Type defaultPage;
+
+                try
+                {
+                    var localSettings = ApplicationData.Current.LocalSettings;
+                    var homePageIndex = localSettings.Values["HomePage"] != null ? (int)localSettings.Values["HomePage"] : 0;
+                    var defaultPageName = App.HomePageList[homePageIndex];
+                    defaultPage = Type.GetType($"GUI.Views.{defaultPageName}");
+                }
+                catch (Exception)
+                {
+                    defaultPage = Type.GetType($"GUI.Views.{nameof(MonitoredIrpsPage)}");
+                }
 
                 // On launch the app frame content will be empty,
                 // so redirect to the default page (monitored irps)

diff --git a/GUI/Models/ConnectionManager.cs b/GUI/Models/ConnectionManager.cs
@@ -51,10 +51,13 @@ public ConnectionManager()
 
         private void ReinitializeSocket()
         {
-            uri = new Uri(ApplicationData.Current.LocalSettings.Values["IrpBrokerLocation"].ToString());
+            var IrpLocation = ApplicationData.Current.LocalSettings.Values.ContainsKey("IrpBrokerLocation") ? 
+                ApplicationData.Current.LocalSettings.Values["IrpBrokerLocation"].ToString() : 
+                Models.DefaultSettings.IrpBrokerUri;
+            uri = new Uri(IrpLocation);
             ClientSocket = new StreamSocket();
             ClientSocket.Control.KeepAlive = true;
-            //ClientSocket.Control.NoDelay = false;
+            ClientSocket.Control.NoDelay = false;
             _Status = BrokerConnectionStatus.Disconnected;
         }
 

diff --git a/GUI/Models/Constants.cs b/GUI/Models/Constants.cs
@@ -33,6 +33,12 @@ public static class Constants
         /// </summary>
         public const string ProjectIssueUrl = @"https://github.com/hugsy/cfb/issues";
 
+    }
+
+
+    public static class DefaultSettings
+    {
+        public const string IrpBrokerUri = "tcp://127.0.0.1:1337";
 
     }
 }