[oe-commits] ghost : tuxbox-tuxtxt-32bpp.bb: no more crash when press text key in e2 video player when non ts file ist playbacked

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dreambox.release_25
Commit: 929490f266949b88fa9fcb98d1d7519933648145
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=929490f266949b88fa9fcb98d1d7519933648145

Author: ghost <andreas.monzner at multimedia-labs.de>
Date:   Sun Feb 22 10:13:15 2009 +0100

tuxbox-tuxtxt-32bpp.bb: no more crash when press text key in e2 video player when non ts file ist playbacked

---

 packages/tuxbox/tuxbox-tuxtxt-32bpp.bb             |    2 +-
 .../tuxbox-tuxtxt-32bpp/allow_different_demux.diff |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tuxbox/tuxbox-tuxtxt-32bpp.bb b/packages/tuxbox/tuxbox-tuxtxt-32bpp.bb
index d3122b2..8129d5c 100644
--- a/packages/tuxbox/tuxbox-tuxtxt-32bpp.bb
+++ b/packages/tuxbox/tuxbox-tuxtxt-32bpp.bb
@@ -16,7 +16,7 @@ FILES_${PN} = "/usr/bin /usr/share/fonts /usr/lib/enigma2/python/Plugins/Extensi
 
 SRCDATE = "20060112"
 PV = "0.0+cvs${SRCDATE}"
-PR = "r9"
+PR = "r10"
 
 S = "${WORKDIR}/tuxtxt"
 
diff --git a/packages/tuxbox/tuxbox-tuxtxt-32bpp/allow_different_demux.diff b/packages/tuxbox/tuxbox-tuxtxt-32bpp/allow_different_demux.diff
index 7af5672..9531680 100644
--- a/packages/tuxbox/tuxbox-tuxtxt-32bpp/allow_different_demux.diff
+++ b/packages/tuxbox/tuxbox-tuxtxt-32bpp/allow_different_demux.diff
@@ -26,7 +26,7 @@ diff -Naur tuxtxt_org/python/plugin.py tuxtxt/python/plugin.py
 +
 +		stream = service and service.stream()
 +		demux = stream and stream.getStreamingData()
-+		demux = demux.get("demux", -1)
++		demux = demux and demux.get("demux", -1)
 +		demux = demux > -1 and "%d" %(demux) or ""
  
  		eDBoxLCD.getInstance().lock()