From 6f7cc47f7c456d2bd2947d8482710d458279e303 Mon Sep 17 00:00:00 2001 From: GetAway Date: Tue, 20 Feb 2018 17:14:27 +0100 Subject: [PATCH] infoviewer: fix update of runningRest there was no update in movieplayer mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/10d9e1714c3a3cfc404751f1682d7dddc76276f7 Author: GetAway Date: 2018-02-20 (Tue, 20 Feb 2018) ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index d989a1095..c2d06a835 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1868,19 +1868,20 @@ void CInfoViewer::display_Info(const char *current, const char *next, txt_curr_start->setText(runningStart, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); txt_curr_start->paint(CC_SAVE_SCREEN_YES); } - - if (runningRest){ - if (txt_curr_rest == NULL) - txt_curr_rest = new CComponentsTextTransp(NULL, currTimeX, CurrInfoY - height, currTimeW, height); - else { - if (txt_curr_rest->isPainted()) - txt_curr_rest->kill(); - txt_curr_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height); - } - txt_curr_rest->setItemName("txt_curr_rest"); - txt_curr_rest->setText(runningRest, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); - txt_curr_rest->paint(CC_SAVE_SCREEN_YES); + } + // we have always runningRest, except it is NULL + if (runningRest) + { + if (txt_curr_rest == NULL) + txt_curr_rest = new CComponentsTextTransp(NULL, currTimeX, CurrInfoY - height, currTimeW, height); + else { + if (txt_curr_rest->isPainted()) + txt_curr_rest->kill(); + txt_curr_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height); } + txt_curr_rest->setItemName("txt_curr_rest"); + txt_curr_rest->setText(runningRest, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT); + txt_curr_rest->paint(CC_SAVE_SCREEN_YES); } //next event