2 files changed, 19 insertions, 11 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 668887a56..fa9ba2b8f 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -15,6 +15,7 @@ using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Controller.Updates;
 using MediaBrowser.IsoMounter;
 using MediaBrowser.Model.IO;
diff --git a/MediaBrowser.ServerApplication/NewItemNotifier.cs b/MediaBrowser.ServerApplication/NewItemNotifier.cs
index 782e04a4a..4864cef62 100644
--- a/MediaBrowser.ServerApplication/NewItemNotifier.cs
+++ b/MediaBrowser.ServerApplication/NewItemNotifier.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using System.Windows;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Logging;
@@ -110,23 +111,29 @@ namespace MediaBrowser.ServerApplication
             // Show the notification
             if (newItems.Count == 1)
             {
-                var window = (MainWindow) App.Current.MainWindow;
-
-                window.Dispatcher.InvokeAsync(() => window.MbTaskbarIcon.ShowCustomBalloon(new ItemUpdateNotification(_logger)
+                Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    DataContext = newItems[0]
+                    var window = (MainWindow)Application.Current.MainWindow;
+
+                    window.Dispatcher.InvokeAsync(() => window.MbTaskbarIcon.ShowCustomBalloon(new ItemUpdateNotification(_logger)
+                    {
+                        DataContext = newItems[0]
 
-                }, PopupAnimation.Slide, 6000));
+                    }, PopupAnimation.Slide, 6000));
+                });
             }
             else if (newItems.Count > 1)
             {
-                var window = (MainWindow)App.Current.MainWindow;
-
-                window.Dispatcher.InvokeAsync(() => window.MbTaskbarIcon.ShowCustomBalloon(new MultiItemUpdateNotification(_logger)
+                Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    DataContext = newItems
+                    var window = (MainWindow)Application.Current.MainWindow;
+
+                    window.Dispatcher.InvokeAsync(() => window.MbTaskbarIcon.ShowCustomBalloon(new MultiItemUpdateNotification(_logger)
+                    {
+                        DataContext = newItems
 
-                }, PopupAnimation.Slide, 6000));
+                    }, PopupAnimation.Slide, 6000));
+                });
             }
         }