From 36afa639a45730fc42b2d1a08e687a478dcd88d3 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Wed, 23 Jun 2021 20:03:26 +0200 Subject: [PATCH] EVENTRECORDER: skip some getMillis for the event recorder they are running as event source and would bring the event recorder into an out-of-sync state --- backends/cloud/cloudicon.cpp | 4 ++-- backends/keymapper/keymapper.cpp | 2 +- common/osd_message_queue.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backends/cloud/cloudicon.cpp b/backends/cloud/cloudicon.cpp index 708bd24f327..9dee1eb6a73 100644 --- a/backends/cloud/cloudicon.cpp +++ b/backends/cloud/cloudicon.cpp @@ -75,12 +75,12 @@ CloudIcon::Type CloudIcon::getShownType() const { } bool CloudIcon::needsUpdate() const { - uint32 delaySinceLastUpdate = g_system->getMillis() - _lastUpdateTime; + uint32 delaySinceLastUpdate = g_system->getMillis(true) - _lastUpdateTime; return delaySinceLastUpdate >= UPDATE_DELAY_MIN_MILLIS; } void CloudIcon::update() { - uint32 currentTime = g_system->getMillis(); + uint32 currentTime = g_system->getMillis(true); uint32 delaySinceLastUpdate = currentTime - _lastUpdateTime; _lastUpdateTime = currentTime; diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp index 1be29220d83..ab7137d4ea8 100644 --- a/backends/keymapper/keymapper.cpp +++ b/backends/keymapper/keymapper.cpp @@ -427,7 +427,7 @@ bool DelayedEventSource::pollEvent(Event &event) { return false; } - uint32 now = g_system->getMillis(); + uint32 now = g_system->getMillis(true); if (now >= _delayedEffectiveTime) { event = _delayedEvents.pop().event; diff --git a/common/osd_message_queue.cpp b/common/osd_message_queue.cpp index 431ce90d189..56a94a005ab 100644 --- a/common/osd_message_queue.cpp +++ b/common/osd_message_queue.cpp @@ -47,7 +47,7 @@ void OSDMessageQueue::addMessage(const Common::U32String &msg) { bool OSDMessageQueue::pollEvent(Common::Event &event) { _mutex.lock(); if (!_messages.empty()) { - uint t = g_system->getMillis(); + uint t = g_system->getMillis(true); if (t - _lastUpdate >= kMinimumDelay) { _lastUpdate = t; Common::U32String msg = _messages.pop();