Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

diff --combined lib/python/Screens/InfoBarGenerics.py
index 89a6b8e3e82879980bce0fff05710a3ddca0a993,3404e3f90c4f917771f8cb011947ef8ab6b9df63..e64081e6924db11166e8a997f98af79ae17ff91c
--- 1/lib/python/Screens/InfoBarGenerics.py
--- 2/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@@ -779,21 -779,12 +779,21 @@@ class InfoBarSeek
                        print "not pauseable."
                        state = self.SEEK_STATE_PLAY
  
 -              oldstate = self.seekstate
                self.seekstate = state
  
 -              for i in range(3):
 -                      if oldstate[i] != self.seekstate[i]:
 -                              (self.session.nav.pause, pauseable.setFastForward, pauseable.setSlowMotion)[i](self.seekstate[i])
 +              if pauseable is not None:
 +                      if self.seekstate[0]:
 +                              print "resolved to PAUSE"
 +                              pauseable.pause()
 +                      elif self.seekstate[1]:
 +                              print "resolved to FAST FORWARD"
 +                              pauseable.setFastForward(self.seekstate[1])
 +                      elif self.seekstate[2]:
 +                              print "resolved to SLOW MOTION"
 +                              pauseable.setSlowMotion(self.seekstate[2])
 +                      else:
 +                              print "resolved to PLAY"
 +                              pauseable.unpause()
  
                for c in self.onPlayStateChanged:
                        c(self.seekstate)
@@@ -1230,7 -1221,7 +1230,7 @@@ class InfoBarExtensions
                self["InstantExtensionsActions"] = HelpableActionMap(self, "InfobarExtensions",
                        {
                                "extensions": (self.showExtensionSelection, _("view extensions...")),
-                       })
+                       }, 1) # lower priority
  
        def addExtension(self, extension, key = None, type = EXTENSION_SINGLE):
                self.list.append((type, extension, key))