Improved BaseApplication

1 files changed, 11 insertions, 23 deletions

diff --git a/MediaBrowser.ServerApplication/App.xaml.cs b/MediaBrowser.ServerApplication/App.xaml.cs
index 5f1b8d0e0..3f0401e8f 100644
--- a/MediaBrowser.ServerApplication/App.xaml.cs
+++ b/MediaBrowser.ServerApplication/App.xaml.cs
@@ -1,44 +1,32 @@
-using System;

-using System.Collections.Generic;

-using System.Diagnostics;

-using System.Windows;

-using MediaBrowser.Common.Kernel;

+using MediaBrowser.Common.Kernel;

 using MediaBrowser.Common.UI;

 using MediaBrowser.Controller;

 using Microsoft.Shell;

+using System;

+using System.Collections.Generic;

+using System.Diagnostics;

+using System.Windows;

 

 namespace MediaBrowser.ServerApplication

 {

     /// <summary>

     /// Interaction logic for App.xaml

     /// </summary>

-    public partial class App : BaseApplication, ISingleInstanceApp

+    public partial class App : BaseApplication, IApplication

     {

-        private const string Unique = "MediaBrowser3";

-

         [STAThread]

         public static void Main()

         {

-            if (SingleInstance<App>.InitializeAsFirstInstance(Unique))

-            {

-                var application = new App();

-                application.InitializeComponent();

-

-                application.Run();

-

-                // Allow single instance code to perform cleanup operations

-                SingleInstance<App>.Cleanup();

-            }

+            RunApplication<App>("MediaBrowserServer");

         }

 

-        #region ISingleInstanceApp Members

-        public bool SignalExternalCommandLineArgs(IList<string> args)

+        protected override void OnSecondInstanceLaunched(IList<string> args)

         {

-            OpenDashboard();

+            base.OnSecondInstanceLaunched(args);

 

-            return true;

+            OpenDashboard();

+            InitializeComponent();

         }

-        #endregion

 

         public static void OpenDashboard()

         {