Fixed some kernel/splash screen async startup issues

1 files changed, 3 insertions, 39 deletions

diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
index 67e20b2a2..2e087a791 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml.cs
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
@@ -1,10 +1,5 @@
-using System;

-using System.Diagnostics;

+using System.Diagnostics;

 using System.Windows;

-using MediaBrowser.Common.Logging;

-using MediaBrowser.Common.UI;

-using MediaBrowser.Controller;

-using MediaBrowser.Model.Progress;

 

 namespace MediaBrowser.ServerApplication

 {

@@ -16,38 +11,7 @@ namespace MediaBrowser.ServerApplication
         public MainWindow()

         {

             InitializeComponent();

-            LoadKernel();

-        }

-

-        private async void LoadKernel()

-        {

-            Progress<TaskProgress> progress = new Progress<TaskProgress>();

-            Splash splash = new Splash(progress);

-

-            splash.Show();

-            

-            try

-            {

-                DateTime now = DateTime.Now;

-

-                await new Kernel().Init(progress);

-

-                double seconds = (DateTime.Now - now).TotalSeconds;

-

-                Logger.LogInfo("Kernel.Init completed in {0} seconds.", seconds);

-

-                // Don't show the system tray icon until the kernel finishes.

-                this.MbTaskbarIcon.Visibility = System.Windows.Visibility.Visible;

-            }

-            catch (Exception ex)

-            {

-                MessageBox.Show("There was an error launching Media Browser Server: " + ex.Message);

-                Close();

-            }

-            finally

-            {

-                splash.Close();

-            }

+            //LoadKernel();

         }

 

         #region Context Menu events

@@ -66,7 +30,7 @@ namespace MediaBrowser.ServerApplication
 

         private void cmExit_click(object sender, RoutedEventArgs e)

         {

-            this.Close();

+            Close();

         }

 

         #endregion