merge experimental...

diff --cc lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
index acf9251,8768021..8768021
mode 100755,100644..100755
--- 1/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
--- 2/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py

diff --cc lib/python/Screens/TaskView.py
index 93c5fbb,660fb27..fbbbed7
mode 100755,100644..100755
--- 1/lib/python/Screens/TaskView.py
--- 2/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@@ -118,11 -122,17 +122,17 @@@ class JobView(InfoBarNotifications, Scr
                from Screens.MessageBox import MessageBox
                if self.settings.afterEvent.getValue() == "deepstandby":
                        if not Screens.Standby.inTryQuitMainloop:
 -                              Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A sleep timer wants to shut down\nyour Dreambox. Shutdown now?"), timeout = 20)
 +                              Notifications.AddNotificationWithCallback(self.sendTryQuitMainloopNotification, MessageBox, _("A sleep timer wants to shut down\nyour STB. Shutdown now?"), timeout = 20)
                elif self.settings.afterEvent.getValue() == "standby":
                        if not Screens.Standby.inStandby:
 -                              Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nDreambox to standby. Do that now?"), timeout = 20)
 +                              Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nSTB to standby. Do that now?"), timeout = 20)
  
+       def checkNotifications(self):
+               InfoBarNotifications.checkNotifications(self)
+               if Notifications.notifications == []:
+                       if self.settings.afterEvent.getValue() == "close" and self.job.status == self.job.FAILED:
+                               self.close(False)
+               
        def sendStandbyNotification(self, answer):
                if answer:
                        Notifications.AddNotification(Screens.Standby.Standby)