Merge branch 'master' of /git/enigma2

diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
index a1522ddbb368d2dbad9db9a39c1efc37fc53af2b..6463f179f3db45f8e20c6a3c8310e65b5585ff72 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
@@ -653,11 +653,11 @@ class NFIDownload(Screen):
                self.session.open(MessageBox, _("To update your Dreambox firmware, please follow these steps:\n1) Turn off your box with the rear power switch and plug in the bootable USB stick.\n2) Turn mains back on and hold the DOWN button on the front panel pressed for 10 seconds.\n3) Wait for bootup and follow instructions of the wizard."), type = MessageBox.TYPE_INFO)
 
        def closeCB(self):
-               if self.download:
+               try:
                        self.download.stop()
                        #self.nfi_failed(None, "Cancelled by user request")
                        self.downloading(False)
-               else:
+               except AttributeError:
                        self.close()
 
 def main(session, **kwargs):