From b039b93f6467e260fd2743e965931bcfe0d1210c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 21 Mar 2023 20:36:22 +0100 Subject: [PATCH] timermanager: fix glcd handling Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8753a04e325fdffb0691bd689fd1d17de97a8311 Author: vanhofen Date: 2023-03-21 (Tue, 21 Mar 2023) Origin message was: ------------------ - timermanager: fix glcd handling ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/timerd/timermanager.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index b757ebf24..79c06d6a5 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -161,12 +161,6 @@ void* CTimerManager::timerThread(void *arg) if(event->stopTime == 0) // if event needs no stop event event->setState(CTimerd::TIMERSTATE_HASFINISHED); timerManager->m_saveEvents = true; -#ifdef ENABLE_GRAPHLCD - if (setTimerIcon) { - cGLCD::unlockIcon(cGLCD::TIMER); - setTimerIcon = false; - } -#endif } if(event->stopTime > 0 && event->eventState == CTimerd::TIMERSTATE_ISRUNNING ) // check if stopevent is wanted @@ -204,6 +198,17 @@ void* CTimerManager::timerThread(void *arg) break; } } +#ifdef ENABLE_GRAPHLCD + if (setTimerIcon) + { + if (timerManager->events.begin() == timerManager->events.end()) // no timers + { + cGLCD::unlockIcon(cGLCD::TIMER); + setTimerIcon = false; + } + } +#endif + pthread_mutex_unlock(&tm_eventsMutex); // save events if requested