diff options
| author | kocsv <kocsv@local> | 2017-05-16 10:18:46 +0200 | 
|---|---|---|
| committer | kocsv <kocsv@local> | 2017-05-16 10:18:46 +0200 | 
| commit | 82e4dc80f5838efcb08ac1c89f58a324b2a26409 (patch) | |
| tree | f1f28bf0e1ad1fdcee4b2f87f34d9aa169080a5a /logic | |
| parent | aacc3bb2b563cd172e340365b8f14ec8fae32d9d (diff) | |
| parent | a9ddb1242181032c549bcac7341e38cb2ee0bb73 (diff) | |
Merge https://github.com/opentrack/opentrack into unstable
merge from upstream
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/tracker.cpp | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/logic/tracker.cpp b/logic/tracker.cpp index 8367ee2f..48a50d80 100644 --- a/logic/tracker.cpp +++ b/logic/tracker.cpp @@ -416,8 +416,9 @@ void Tracker::run()              backlog_time = backlog_time.zero();          } -        const int sleep_time_ms = iround(clamp(const_sleep_ms - backlog_time, -                                               ns(0), ms(50)).count()); +        const int sleep_time_ms = iround(time_cast<ms>(clamp(const_sleep_ms - backlog_time, +                                                             ns(0), ms(50))) +                                         .count());          portable::sleep(sleep_time_ms);      } | 
