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();
 		}