Use existing AppHost if one is already listening, rename to Program t…

…o match template
ServiceStackApps · Sep 23, 2015 · a1b6660 · a1b6660
1 parent d78f742
commit a1b6660
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/RedisReact/RedisReact.AppMac/AppHost.cs b/src/RedisReact/RedisReact.AppMac/AppHost.cs
@@ -72,8 +72,8 @@ public class NativeHost
 		public void ShowAbout()
 		{
 			//Invoke native about menu item programmatically.
-			MainClass.MainMenu.InvokeOnMainThread (() => {
-				foreach (var item in MainClass.MainMenu.ItemArray()) {
+			Program.MainMenu.InvokeOnMainThread (() => {
+				foreach (var item in Program.MainMenu.ItemArray()) {
 					if (item.Title == "RedisReact") {
 						item.Submenu.PerformActionForItem(0);
 					}

diff --git a/src/RedisReact/RedisReact.AppMac/MainWindow.cs b/src/RedisReact/RedisReact.AppMac/MainWindow.cs
@@ -34,8 +34,8 @@ void Initialize ()
 		public override void AwakeFromNib()
 		{
 			base.AwakeFromNib ();
-			MainClass.MainMenu = NSApplication.SharedApplication.MainMenu;
-			webView.MainFrameUrl = MainClass.HostUrl;
+			Program.MainMenu = NSApplication.SharedApplication.MainMenu;
+			webView.MainFrameUrl = Program.HostUrl;
 			webView.Frame = new System.Drawing.RectangleF(0,0,this.Frame.Width,this.Frame.Height);
 			this.DidResize += (sender, e) =>  {
 				webView.Frame = new System.Drawing.RectangleF(0,0,this.Frame.Width,this.Frame.Height);

diff --git a/src/RedisReact/RedisReact.AppMac/Main.cs → src/RedisReact/RedisReact.AppMac/Program.cs b/src/RedisReact/RedisReact.AppMac/Main.cs → src/RedisReact/RedisReact.AppMac/Program.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Drawing;
+using ServiceStack.Text;
 using MonoMac.Foundation;
 using MonoMac.AppKit;
 using MonoMac.ObjCRuntime;
 
 namespace RedisReact.AppMac
 {
-	public static class MainClass
+	public static class Program
 	{
 		public static string HostUrl = "http://127.0.0.1:3337/";
 		public static string ListenOn = "http://*:3337/";
@@ -16,8 +17,15 @@ public static class MainClass
 
 		static void Main (string[] args)
 		{
-			App = new AppHost();
-			App.Init().Start(ListenOn);
+			try 
+			{
+				App = new AppHost();
+				App.Init().Start(ListenOn);
+			} 
+			catch (Exception) 
+			{
+				"Using existing AppHost found on {0}".Print(HostUrl);
+			}
 
 			NSApplication.Init();
 			NSApplication.Main(args);

diff --git a/src/RedisReact/RedisReact.AppMac/RedisReact.AppMac.csproj b/src/RedisReact/RedisReact.AppMac/RedisReact.AppMac.csproj
@@ -83,10 +83,10 @@
     <Compile Include="AppDelegate.cs" />
     <Compile Include="AppDelegate.designer.cs" />
     <Compile Include="AppHost.cs" />
-    <Compile Include="Main.cs" />
     <Compile Include="MainWindow.cs" />
     <Compile Include="MainWindow.designer.cs" />
     <Compile Include="MainWindowController.cs" />
+    <Compile Include="Program.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />