properly fix GSOD from last commit

[enigma2.git] / lib / python / Components / DreamInfoHandler.py

diff --git a/lib/python/Components/DreamInfoHandler.py b/lib/python/Components/DreamInfoHandler.py
index 261e800f5f5574f5a9ea7a05b598ddfabcd53f10..f9bd479e68d20f8bb5ccd03d3f059db37afb29f8 100644 (file)
--- a/lib/python/Components/DreamInfoHandler.py
+++ b/lib/python/Components/DreamInfoHandler.py
@@ -22,8 +22,7 @@ class InfoHandler(xml.sax.ContentHandler):
                self.elements = []
                self.validFileTypes = ["skin", "config", "services", "favourites", "package"]
                self.prerequisitesMet = prerequisiteMet
-       
-                               
+               
        def printError(self, error):
                print "Error in defaults xml files:", error
                raise InfoHandlerParseError, error
@@ -110,6 +109,7 @@ class DreamInfoHandler:
                
                self.console = eConsoleAppContainer()
                self.console.appClosed.get().append(self.installNext)
+               self.reloadFavourites = False
                
                self.statusCallback = statusCallback
                self.setStatus(self.STATUS_INIT)
@@ -200,6 +200,10 @@ class DreamInfoHandler:
                self.statusCallback(self.status, None)
                                                
        def installNext(self, *args, **kwargs):
+               if self.reloadFavourites:
+                       self.reloadFavourites = False
+                       db = eDVBDB.getInstance().reloadBouquets()
+
                self.currentIndex += 1
                attributes = self.installingAttributes
                #print "attributes:", attributes
@@ -213,10 +217,13 @@ class DreamInfoHandler:
                        else:
                                print "increment meta index to install next package"
                                self.currentlyInstallingMetaIndex += 1
+                               self.currentAttributeIndex = 0
                                self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])
+                               return
                
                self.setStatus(self.STATUS_WORKING)             
                
+               print "currentAttributeIndex:", self.currentAttributeIndex
                currentAttribute = self.attributeNames[self.currentAttributeIndex]
                
                print "installing", currentAttribute, "with index", self.currentIndex
@@ -305,7 +312,8 @@ class DreamInfoHandler:
 
        def installFavourites(self, directory, name):
                print "installing favourites:", directory, " - ", name
-
+               self.reloadFavourites = True
+               
                if self.blocking:
                        os.system("cp %s %s" % ((directory + name), resolveFilename(SCOPE_CONFIG)))
                        self.installNext()