4 files changed, 23 insertions, 8 deletions
diff --git a/MediaBrowser.UI/App.xaml.cs b/MediaBrowser.UI/App.xaml.cs
index f2eaeb152..c4a99c1a8 100644
--- a/MediaBrowser.UI/App.xaml.cs
+++ b/MediaBrowser.UI/App.xaml.cs
@@ -7,6 +7,7 @@ using MediaBrowser.Common.UI;
 using MediaBrowser.IsoMounter;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Weather;
 using MediaBrowser.UI.Controller;
@@ -235,16 +236,29 @@ namespace MediaBrowser.UI
         [STAThread]
         public static void Main()
         {
-            RunApplication<App>("MediaBrowserUI");
+            var application = new App(LogManager.GetLogger("App"));
+            application.InitializeComponent();
+
+            application.Run();
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="App" /> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        public App(ILogger logger)
+            : base(logger)
+        {
+
+        }
+        
+        /// <summary>
         /// Instantiates the kernel.
         /// </summary>
         /// <returns>IKernel.</returns>
         protected override IKernel InstantiateKernel()
         {
-            return new UIKernel(new PismoIsoManager(LogManager.GetLogger("PismoIsoManager")));
+            return new UIKernel(new PismoIsoManager(Logger), Logger);
         }
 
         /// <summary>
diff --git a/MediaBrowser.UI/Controller/UIKernel.cs b/MediaBrowser.UI/Controller/UIKernel.cs
index cfc367fb9..21db41948 100644
--- a/MediaBrowser.UI/Controller/UIKernel.cs
+++ b/MediaBrowser.UI/Controller/UIKernel.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Logging;
 using MediaBrowser.Model.Connectivity;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 using MediaBrowser.UI.Configuration;
 using MediaBrowser.UI.Playback;
@@ -46,8 +47,8 @@ namespace MediaBrowser.UI.Controller
         /// <summary>
         /// Initializes a new instance of the <see cref="UIKernel" /> class.
         /// </summary>
-        public UIKernel(IIsoManager isoManager)
-            : base(isoManager)
+        public UIKernel(IIsoManager isoManager, ILogger logger)
+            : base(isoManager, logger)
         {
             Instance = this;
         }
diff --git a/MediaBrowser.UI/Playback/BaseMediaPlayer.cs b/MediaBrowser.UI/Playback/BaseMediaPlayer.cs
index dded1b0a0..f635b474d 100644
--- a/MediaBrowser.UI/Playback/BaseMediaPlayer.cs
+++ b/MediaBrowser.UI/Playback/BaseMediaPlayer.cs
@@ -31,7 +31,7 @@ namespace MediaBrowser.UI.Playback
         public event EventHandler VolumeChanged;
         protected void OnVolumeChanged()
         {
-            EventHelper.FireEventIfNotNull(VolumeChanged, this, EventArgs.Empty);
+            EventHelper.FireEventIfNotNull(VolumeChanged, this, EventArgs.Empty, Logger);
         }
         #endregion
 
@@ -42,7 +42,7 @@ namespace MediaBrowser.UI.Playback
         public event EventHandler PlayStateChanged;
         protected void OnPlayStateChanged()
         {
-            EventHelper.FireEventIfNotNull(PlayStateChanged, this, EventArgs.Empty);
+            EventHelper.FireEventIfNotNull(PlayStateChanged, this, EventArgs.Empty, Logger);
         }
         #endregion
         
diff --git a/MediaBrowser.UI/Playback/PlaybackManager.cs b/MediaBrowser.UI/Playback/PlaybackManager.cs
index 808d605e9..86e0773a4 100644
--- a/MediaBrowser.UI/Playback/PlaybackManager.cs
+++ b/MediaBrowser.UI/Playback/PlaybackManager.cs
@@ -49,7 +49,7 @@ namespace MediaBrowser.UI.Playback
                 Options = options,
                 Player = player,
                 PlayerConfiguration = playerConfiguration
-            });
+            }, Logger);
         }
         #endregion
 
@@ -70,7 +70,7 @@ namespace MediaBrowser.UI.Playback
             {
                 Items = items,
                 Player = player
-            });
+            }, Logger);
         }
         #endregion