From 91e5b3d7432b7674fbdf50bee9c2709f66741c2a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Jul 2020 21:07:16 +0200 Subject: [PATCH] glcd: just code formatting Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/52d61362683f028ee8d2f0e3b57e3b62acd0ab3f Author: vanhofen Date: 2020-07-03 (Fri, 03 Jul 2020) Origin message was: ------------------ - glcd: just code formatting --- src/driver/glcd/glcd.cpp | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp index 99f8f1548..1a6af5eee 100644 --- a/src/driver/glcd/glcd.cpp +++ b/src/driver/glcd/glcd.cpp @@ -738,12 +738,24 @@ void* cGLCD::TimeThread(void *p) while (((cGLCD *)p)->time_thread_started) { sleep(1); - if ((cglcd->locked_countdown == true || cglcd->channelLocked == true || cglcd->timeLocked == true || - cglcd->durationLocked == true || cglcd->startLocked == true || cglcd->endLocked == true || - cglcd->recLocked == true || cglcd->muteLocked == true || cglcd->tsLocked == true || - cglcd->ecmLocked == true || cglcd->timerLocked == true || cglcd->ddLocked == true || - cglcd->txtLocked == true || cglcd->camLocked == true || - cglcd->doShowVolume == true || cglcd->doMirrorOSD == true) && !cglcd->doExit) + if (!cglcd->doExit && ( + cglcd->locked_countdown == true + || cglcd->channelLocked == true + || cglcd->timeLocked == true + || cglcd->durationLocked == true + || cglcd->startLocked == true + || cglcd->endLocked == true + || cglcd->recLocked == true + || cglcd->muteLocked == true + || cglcd->tsLocked == true + || cglcd->ecmLocked == true + || cglcd->timerLocked == true + || cglcd->ddLocked == true + || cglcd->txtLocked == true + || cglcd->camLocked == true + || cglcd->doShowVolume == true + || cglcd->doMirrorOSD == true + )) { cGLCD::getInstance()->CountDown(); }