fix abort in quickzap bouquet add

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 2e11eb578cb974cb3e9bbed0af318645b4c76f1b..60e0f167951033ed2e7e7c82db339a1fc2b91429 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1512,10 +1512,11 @@ class InfoBarSubserviceSelection:
                                self.addSubserviceToBouquet(self.bouquets[0][1])
                                self.session.open(MessageBox, _("Service has been added to the favourites."), MessageBox.TYPE_INFO)
 
                                self.addSubserviceToBouquet(self.bouquets[0][1])
                                self.session.open(MessageBox, _("Service has been added to the favourites."), MessageBox.TYPE_INFO)
 

-       def bouquetSelClosed(self, **args):
+       def bouquetSelClosed(self, confirmed):

                self.bsel = None
                del self.selectedSubservice
                self.bsel = None
                del self.selectedSubservice

-               self.session.open(MessageBox, _("Service has been added to the selected bouquet."), MessageBox.TYPE_INFO)
+               if confirmed:
+                       self.session.open(MessageBox, _("Service has been added to the selected bouquet."), MessageBox.TYPE_INFO)

 
        def addSubserviceToBouquet(self, dest):
                serviceHandler = eServiceCenter.getInstance()
 
        def addSubserviceToBouquet(self, dest):
                serviceHandler = eServiceCenter.getInstance()


@@ -1534,7 +1535,7 @@ class InfoBarSubserviceSelection:
                                if pos1 != -1 and pos2 != -1 and str1[pos1:] == str2[pos2:]:
                                        self.servicelist.setMode()
                if self.bsel:
                                if pos1 != -1 and pos2 != -1 and str1[pos1:] == str2[pos2:]:
                                        self.servicelist.setMode()
                if self.bsel:

-                       self.bsel.close()
+                       self.bsel.close(True)

                else:
                        del self.selectedSubservice
 
                else:
                        del self.selectedSubservice