Merge branch 'master' of https://github.com/OpenPLi/enigma2
[openblackhole/openblackhole-enigma2.git] / lib / python / Screens / ChannelSelection.py
index a31cf07..bec955d 100644 (file)
@@ -461,6 +461,7 @@ class ChannelContextMenu(Screen):
                if self.session.pipshown:
                        del self.session.pip
                self.session.pip = self.session.instantiateDialog(PictureInPicture)
+               self.session.pip.setAnimationMode(0)
                self.session.pip.show()
                newservice = self.csel.servicelist.getCurrent()
                currentBouquet = self.csel.servicelist and self.csel.servicelist.getRoot()
@@ -1846,7 +1847,14 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
                config.usage.multibouquet.addNotifier(self.multibouquet_config_changed)
                self.new_service_played = False
                self.dopipzap = False
-               self.onExecBegin.append(self.asciiOn)
+               try:
+                       vumachine = file("/proc/stb/info/vumodel").read().strip()
+                       if vumachine == "ultimo" or vumachine == "zero":
+                               self.onExecBegin.append(self.asciiOff)
+                       else:
+                               self.onExecBegin.append(self.asciiOn)
+               except:
+                       self.onExecBegin.append(self.asciiOn)
                self.mainScreenMode = None
                self.mainScreenRoot = None
 
@@ -2313,6 +2321,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
                self.onLayoutFinish.append(self.onCreate)
 
                self.info = session.instantiateDialog(RadioInfoBar) # our simple infobar
+               self.info.setAnimationMode(0)
 
                self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"],
                        {