diff options
| author |  bunnei | 2015-02-10 23:08:04 -0500 |
|---|---|---|
| committer | bunnei | 2015-02-10 23:08:04 -0500 |
| commit | 2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f (patch) | |
| tree | fca138e8377c4d66bd1fe026a3d2fef54a7f090c /src/core/hle/kernel/mutex.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/mutex.cpp')
| -rw-r--r-- | src/core/hle/kernel/mutex.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index a811db392..be2c49706 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp | |||
| @@ -64,7 +64,7 @@ void Mutex::Acquire() { | |||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | void Mutex::Acquire(SharedPtr<Thread> thread) { | 66 | void Mutex::Acquire(SharedPtr<Thread> thread) { |
| 67 | _assert_msg_(Kernel, !ShouldWait(), "object unavailable!"); | 67 | ASSERT_MSG(!ShouldWait(), "object unavailable!"); |
| 68 | 68 | ||
| 69 | // Actually "acquire" the mutex only if we don't already have it... | 69 | // Actually "acquire" the mutex only if we don't already have it... |
| 70 | if (lock_count == 0) { | 70 | if (lock_count == 0) { |