aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-04 21:25:28 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-04 21:25:28 -0400
commit10551b68041c9ed791b95840d8b159c27694932d (patch)
tree33015ca1d09f4ddd923fb45a6c1c3d86b280e228
parentb50a15aaf425f8852568f6d324a92a24f82b46d2 (diff)
Removed static and added an error message
-rw-r--r--MediaBrowser.ServerApplication/MainWindow.xaml.cs11
1 files changed, 4 insertions, 7 deletions
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
index 02a6d1be3..7b6932848 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml.cs
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
@@ -23,15 +23,13 @@ namespace MediaBrowser.ServerApplication
/// </summary>
public partial class MainWindow : Window
{
- protected static Kernel kernel;
-
public MainWindow()
{
InitializeComponent();
LoadKernel();
}
- private static void LoadKernel()
+ private void LoadKernel()
{
Progress<TaskProgress> progress = new Progress<TaskProgress>();
SplashScreen splash = new SplashScreen(progress);
@@ -40,12 +38,11 @@ namespace MediaBrowser.ServerApplication
{
splash.Show();
- kernel = new Kernel();
-
- kernel.Init(progress);
+ new Kernel().Init(progress);
}
- catch
+ catch (Exception ex)
{
+ MessageBox.Show("There was an error launching Media Browser: " + ex.Message);
}
finally
{