Merge remote-tracking branch 'origin/dev' into refactor/untangle-assets-mess

This commit is contained in:
Tropical 2026-03-09 00:58:36 -05:00
commit e571795e99

View file

@ -103,7 +103,7 @@ __int64 System::currentTimeMillis()
gettimeofday(&tv, NULL);
// Convert to milliseconds since unix epoch instead of windows file time
// time is expecting calculation to be between 10-30 ms.
return (int64_t)tv.tv_sec * 1000LL + tv.tv_sec / 1000;
return (int64_t)tv.tv_sec * 1000LL + tv.tv_usec / 1000;
#else
SYSTEMTIME UTCSysTime;