diff options
| author | 2015-02-10 23:08:04 -0500 | |
|---|---|---|
| committer | 2015-02-10 23:08:04 -0500 | |
| commit | 2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f (patch) | |
| tree | fca138e8377c4d66bd1fe026a3d2fef54a7f090c /src/core/hle/kernel/timer.cpp | |
| parent | GSP: Fixed typo in SignalInterrupt (diff) | |
| parent | Asserts: break/crash program, fit to style guide; log.h->assert.h (diff) | |
| download | yuzu-2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f.tar.gz yuzu-2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f.tar.xz yuzu-2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f.zip | |
Merge pull request #500 from archshift/assert
Made asserts actually break the debugger, or crash if the program is not in debug mode.
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 4352fc99c..aa0afb796 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp | |||
| @@ -38,7 +38,7 @@ bool Timer::ShouldWait() { | |||
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | void Timer::Acquire() { | 40 | void Timer::Acquire() { |
| 41 | _assert_msg_(Kernel, !ShouldWait(), "object unavailable!"); | 41 | ASSERT_MSG( !ShouldWait(), "object unavailable!"); |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | void Timer::Set(s64 initial, s64 interval) { | 44 | void Timer::Set(s64 initial, s64 interval) { |