diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-08-23 02:20:55 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-08-23 02:26:45 +0200 |
| commit | 2624b1eae6df88c99d08dc5bb13dab35943d3fa2 (patch) | |
| tree | ad95f3799284abfa7eb8887e4402f8f8660b7705 /src/core | |
| parent | Merge pull request #4546 from lioncash/telemetry (diff) | |
| download | yuzu-2624b1eae6df88c99d08dc5bb13dab35943d3fa2.tar yuzu-2624b1eae6df88c99d08dc5bb13dab35943d3fa2.tar.gz yuzu-2624b1eae6df88c99d08dc5bb13dab35943d3fa2.tar.bz2 yuzu-2624b1eae6df88c99d08dc5bb13dab35943d3fa2.tar.lz yuzu-2624b1eae6df88c99d08dc5bb13dab35943d3fa2.tar.xz yuzu-2624b1eae6df88c99d08dc5bb13dab35943d3fa2.tar.zst yuzu-2624b1eae6df88c99d08dc5bb13dab35943d3fa2.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core_timing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 71af26ec5..d987a2cfc 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -14,7 +14,7 @@ namespace Core::Timing { -constexpr u64 MAX_SLICE_LENGTH = 4000; +constexpr s64 MAX_SLICE_LENGTH = 4000; std::shared_ptr<EventType> CreateEvent(std::string name, TimedCallback&& callback) { return std::make_shared<EventType>(std::move(callback), std::move(name)); @@ -136,7 +136,7 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type, void CoreTiming::AddTicks(u64 ticks) { this->ticks += ticks; - downcount -= ticks; + downcount -= static_cast<s64>(ticks); } void CoreTiming::Idle() { |