From bda8caf35432cabb6ad3b1db8710ff720cb8d48c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 19 Jan 2025 21:42:16 +0100 Subject: [PATCH] record-info: second try to fix rec/ts-icon for current channel Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/80220af4bf17b5937c483c257c3d2d8715e5e50d Author: vanhofen Date: 2025-01-19 (Sun, 19 Jan 2025) Origin message was: ------------------ - record-info: second try to fix rec/ts-icon for current channel ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/record_info.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/gui/widget/record_info.cpp b/src/gui/widget/record_info.cpp index 3dcd36fe2..b5493e538 100644 --- a/src/gui/widget/record_info.cpp +++ b/src/gui/widget/record_info.cpp @@ -81,9 +81,6 @@ void CRecInfo::init() bool recordModeActive = crm->RecordingStatus(); if (recordModeActive) { - rec_icon = NEUTRINO_ICON_REC_GRAY; - ts_icon = NEUTRINO_ICON_AUTO_SHIFT_GRAY; - // get current record count int records = crm->GetRecordCount(); @@ -97,12 +94,22 @@ void CRecInfo::init() int cur_rec_mode = crm->GetRecordMode(cur_chid); // set 'active' icon for record mode - if (cur_rec_mode & CRecordManager::RECMODE_REC) - rec_icon = NEUTRINO_ICON_REC; + if (rec_mode & CRecordManager::RECMODE_REC) + { + if (cur_rec_mode & CRecordManager::RECMODE_REC) + rec_icon = NEUTRINO_ICON_REC; + else + rec_icon = NEUTRINO_ICON_REC_GRAY; + } // set 'active' icon for timeshift mode - if (cur_rec_mode & CRecordManager::RECMODE_TSHIFT) - ts_icon = NEUTRINO_ICON_AUTO_SHIFT; + if (rec_mode & CRecordManager::RECMODE_TSHIFT) + { + if (cur_rec_mode & CRecordManager::RECMODE_TSHIFT) + ts_icon = NEUTRINO_ICON_AUTO_SHIFT; + else + ts_icon = NEUTRINO_ICON_AUTO_SHIFT_GRAY; + } if (rec_mode == CRecordManager::RECMODE_REC_TSHIFT) records--; // subtract ts