From 648218fc999ff53779e30d9d67cbd10bf3bccf8c Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 29 Sep 2013 21:35:41 +0200 Subject: [PATCH] CInfoViewer: fix missing displaying content of infobar.txt Text from infobar.txt was not painted after channel switch or in virtual zap mode. Thx snafed for suggestion. TODO: many flicker effects in "virtual zap mode" --- src/gui/infoviewer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index e4f392773..2e6dc7856 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -614,7 +614,6 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap void CInfoViewer::showTitle(t_channel_id chid, const bool calledFromNumZap, int epgpos) { - CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(chid); if(channel) { @@ -856,7 +855,7 @@ void CInfoViewer::loop(bool show_dot) #endif if (msg == (neutrino_msg_t) g_settings.key_screenshot) { res = CNeutrinoApp::getInstance()->handleMsg(msg, data); - + } else if (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites) { g_RCInput->postMsg (msg, 0); res = messages_return::cancel_info; @@ -1255,6 +1254,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data) } else if ((msg == NeutrinoMessages::EVT_ZAP_COMPLETE) || (msg == NeutrinoMessages::EVT_ZAP_ISNVOD)) { channel_id = (*(t_channel_id *)data); + killInfobarText(); return messages_return::handled; } else if (msg == NeutrinoMessages::EVT_ZAP_CA_ID) { //chanready = 1; @@ -1876,7 +1876,7 @@ void CInfoViewer::showInfoFile() //paint info, don't save background, if already painted, global hide is also done by killTitle() bool save_bg = !infobar_txt->isPainted(); - if (infobar_txt->textChanged()) + if (infobar_txt->textChanged() || virtual_zap_mode) infobar_txt->paint(save_bg); }