Merge pull request #1 from spacehuhn/v2.2

Attack timeout is changing display timeout FIX
This commit is contained in:
BorcheM
2019-10-20 00:51:46 +02:00
committed by GitHub

View File

@@ -461,7 +461,7 @@ void DisplayUI::update() {
draw(); draw();
uint32_t timeout = settings.getAttackSettings().timeout * 1000; uint32_t timeout = settings.getDisplaySettings().timeout * 1000;
if (currentTime > timeout) { if (currentTime > timeout) {
if (!tempOff) { if (!tempOff) {
@@ -889,4 +889,4 @@ void DisplayUI::setTime(int h, int m, int s) {
clockHour = h; clockHour = h;
clockMinute = m; clockMinute = m;
clockSecond = s; clockSecond = s;
} }