diff options
| author | Lioncash <mathew1800@gmail.com> | 2016-03-12 21:06:31 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2016-03-12 21:06:31 +0100 |
| commit | 12e92f17de40522e66954d3c5148e4520c9ca775 (patch) | |
| tree | 0de55470238cb9579f7c190f044957c7bf76bdee /src/core/hle/kernel | |
| parent | Merge pull request #1266 from Subv/miiapplet (diff) | |
| download | yuzu-12e92f17de40522e66954d3c5148e4520c9ca775.tar yuzu-12e92f17de40522e66954d3c5148e4520c9ca775.tar.gz yuzu-12e92f17de40522e66954d3c5148e4520c9ca775.tar.bz2 yuzu-12e92f17de40522e66954d3c5148e4520c9ca775.tar.lz yuzu-12e92f17de40522e66954d3c5148e4520c9ca775.tar.xz yuzu-12e92f17de40522e66954d3c5148e4520c9ca775.tar.zst yuzu-12e92f17de40522e66954d3c5148e4520c9ca775.zip | |
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 53feebbc0..2b7c6992a 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp @@ -35,7 +35,7 @@ void Event::Acquire() { ASSERT_MSG(!ShouldWait(), "object unavailable!"); // Release the event if it's not sticky... - if (reset_type != RESETTYPE_STICKY) + if (reset_type != ResetType::Sticky) signaled = false; } diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index ce6bbd719..b8daaeede 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -43,7 +43,7 @@ bool Timer::ShouldWait() { void Timer::Acquire() { ASSERT_MSG( !ShouldWait(), "object unavailable!"); - if (reset_type == RESETTYPE_ONESHOT) + if (reset_type == ResetType::OneShot) signaled = false; } |