diff options
author | bunnei <bunneidev@gmail.com> | 2015-01-15 05:41:33 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-01-22 00:42:04 +0100 |
commit | 1f7a04f05a488b7d457d356f9bf2dda296cd6b92 (patch) | |
tree | ab6bffea6b9f85039af93f4f809c4d657f192d8f /src/core/hle/kernel/address_arbiter.cpp | |
parent | Event: Get rid of permanent_lock hack. (diff) | |
download | yuzu-1f7a04f05a488b7d457d356f9bf2dda296cd6b92.tar yuzu-1f7a04f05a488b7d457d356f9bf2dda296cd6b92.tar.gz yuzu-1f7a04f05a488b7d457d356f9bf2dda296cd6b92.tar.bz2 yuzu-1f7a04f05a488b7d457d356f9bf2dda296cd6b92.tar.lz yuzu-1f7a04f05a488b7d457d356f9bf2dda296cd6b92.tar.xz yuzu-1f7a04f05a488b7d457d356f9bf2dda296cd6b92.tar.zst yuzu-1f7a04f05a488b7d457d356f9bf2dda296cd6b92.zip |
Diffstat (limited to 'src/core/hle/kernel/address_arbiter.cpp')
-rw-r--r-- | src/core/hle/kernel/address_arbiter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index b7434aaf2..ff1472066 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp @@ -15,7 +15,7 @@ namespace Kernel { -class AddressArbiter : public Object { +class AddressArbiter : public WaitObject { public: std::string GetTypeName() const override { return "Arbiter"; } std::string GetName() const override { return name; } @@ -30,7 +30,8 @@ public: /// Arbitrate an address ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s32 value, u64 nanoseconds) { - Object* object = Kernel::g_handle_table.GetGeneric(handle).get(); + WaitObject* object = static_cast<WaitObject*>(Kernel::g_handle_table.GetGeneric(handle).get()); + if (object == nullptr) return InvalidHandle(ErrorModule::Kernel); |