Merge pull request #11921 from akallabeth/timer-fix-diff

[core,timer] fix reschedule interval
This commit is contained in:
akallabeth
2025-10-12 08:31:50 +02:00
committed by GitHub
4 changed files with 4 additions and 4 deletions

View File

@@ -1160,7 +1160,7 @@ static UINT video_plugin_initialize(IWTSPlugin* plugin, IWTSVirtualChannelManage
if (status == CHANNEL_RC_OK)
video->context->priv->timerID =
freerdp_timer_add(video->rdpcontext, 20000, timer_cb, video->context, true);
freerdp_timer_add(video->rdpcontext, 20000000, timer_cb, video->context, true);
video->initialized = video->context->priv->timerID != 0;
if (!video->initialized)
status = ERROR_INTERNAL_ERROR;

View File

@@ -27,7 +27,7 @@
#define TAG CLIENT_TAG("wayland.disp")
#define RESIZE_MIN_DELAY_NS 200000UL /* minimum delay in ns between two resizes */
#define RESIZE_MIN_DELAY_NS 200000000UL /* minimum delay in ns between two resizes */
struct s_wlfDispContext
{

View File

@@ -40,7 +40,7 @@
#include <freerdp/log.h>
#define TAG CLIENT_TAG("x11disp")
#define RESIZE_MIN_DELAY_NS 200000UL /* minimum delay in ms between two resizes */
#define RESIZE_MIN_DELAY_NS 200000000UL /* minimum delay in ms between two resizes */
struct s_xfDispContext
{

View File

@@ -217,7 +217,7 @@ static DWORD WINAPI timer_thread(LPVOID arg)
}
const uint64_t diff = next - now;
const uint64_t diffMS = diff / 1000;
const uint64_t diffMS = diff / 1000000ull;
timeout = INFINITE;
if (diffMS < INFINITE)
timeout = (uint32_t)diffMS;