From d3a9264a78e7d3607158b3556c6ff0bc5c05f50b Mon Sep 17 00:00:00 2001 From: nightshad Date: Sat, 2 Apr 2011 08:18:56 +0000 Subject: [PATCH] Backport fix from tuxbox cvs. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1373 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7a4c1af962d43f0cbc53a92ee87e0d2f6516bfc8 Author: nightshad Date: 2011-04-02 (Sat, 02 Apr 2011) ------------------ This commit was generated by Migit --- lib/libtuxtxt/tuxtxt.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp index 2e50865d7..c0c800df1 100644 --- a/lib/libtuxtxt/tuxtxt.cpp +++ b/lib/libtuxtxt/tuxtxt.cpp @@ -5839,14 +5839,12 @@ void DecodePage() /* copy page to decode buffer */ if (tuxtxt_cache.subpagetable[tuxtxt_cache.page] == 0xff) /* not cached: do nothing */ return; - if (tuxtxt_cache.zap_subpage_manual) - pCachedPage = tuxtxt_cache.astCachetable[tuxtxt_cache.page][tuxtxt_cache.subpage]; - else - pCachedPage = tuxtxt_cache.astCachetable[tuxtxt_cache.page][tuxtxt_cache.subpagetable[tuxtxt_cache.page]]; + int tmp_subpage = tuxtxt_cache.zap_subpage_manual ? tuxtxt_cache.subpage : tuxtxt_cache.subpagetable[tuxtxt_cache.page]; + pCachedPage = tuxtxt_cache.astCachetable[tuxtxt_cache.page][tmp_subpage]; if (!pCachedPage) /* not cached: do nothing */ return; - tuxtxt_decompress_page(tuxtxt_cache.page,tuxtxt_cache.subpage,&page_char[40]); + tuxtxt_decompress_page(tuxtxt_cache.page,tmp_subpage,&page_char[40]); memmove(&page_char[8], pCachedPage->p0, 24); /* header line without timestring */