From d794eecec4f4b9a46df422b28c86e136bfd92abf Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Sun, 19 Aug 2012 11:58:35 -0400
Subject: Added initial implementation of the metadata provider network, along
 with the first few providers

---
 MediaBrowser.ServerApplication/MainWindow.xaml    |  2 +-
 MediaBrowser.ServerApplication/MainWindow.xaml.cs | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml b/MediaBrowser.ServerApplication/MainWindow.xaml
index 35e78424d..753db4832 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:tb="http://www.hardcodet.net/taskbar"
-        Title="MainWindow" Height="350" Width="525" AllowsTransparency="True" Background="Transparent" WindowStyle="None" ShowInTaskbar="False" Loaded="MainWindow_Loaded">
+        Title="MainWindow" Height="350" Width="525" AllowsTransparency="True" Background="Transparent" WindowStyle="None" ShowInTaskbar="False">
     <Grid>
         <tb:TaskbarIcon Name="MbTaskbarIcon" IconSource="/Icons/Icon.ico" ToolTipText="MediaBrowser Server" Visibility="Hidden">
 
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
index 3cc29e7df..abca9149f 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml.cs
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
@@ -4,6 +4,8 @@ using System.Windows;
 using MediaBrowser.Common.Logging;
 using MediaBrowser.Controller;
 using MediaBrowser.Model.Progress;
+using System.Threading.Tasks;
+using MediaBrowser.Common.UI;
 
 namespace MediaBrowser.ServerApplication
 {
@@ -18,10 +20,10 @@ namespace MediaBrowser.ServerApplication
             LoadKernel();
         }
 
-        private void LoadKernel()
+        private async void LoadKernel()
         {
             Progress<TaskProgress> progress = new Progress<TaskProgress>();
-            Common.UI.Splash splash = new Common.UI.Splash(progress);
+            Splash splash = new Splash(progress);
 
             splash.Show();
             
@@ -29,11 +31,14 @@ namespace MediaBrowser.ServerApplication
             {
                 DateTime now = DateTime.Now;
 
-                new Kernel().Init(progress);
+                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)
             {
@@ -46,16 +51,6 @@ namespace MediaBrowser.ServerApplication
             }
         }
 
-        #region Main Window Events
-
-        private void MainWindow_Loaded(object sender, RoutedEventArgs e)
-        {
-            // Don't show the system tray icon until the app has loaded.
-            this.MbTaskbarIcon.Visibility = System.Windows.Visibility.Visible;
-        }
-
-        #endregion
-
         #region Context Menu events
 
         private void cmOpenDashboard_click(object sender, RoutedEventArgs e)
-- 
cgit v1.2.3