diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/event.h | 12 | ||||
| -rw-r--r-- | src/yuzu/debugger/wait_tree.cpp | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h index 1c99911b2..3c20c05e8 100644 --- a/src/core/hle/kernel/event.h +++ b/src/core/hle/kernel/event.h | |||
| @@ -31,10 +31,9 @@ public: | |||
| 31 | return HANDLE_TYPE; | 31 | return HANDLE_TYPE; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | ResetType reset_type; ///< Current ResetType | 34 | ResetType GetResetType() const { |
| 35 | 35 | return reset_type; | |
| 36 | bool signaled; ///< Whether the event has already been signaled | 36 | } |
| 37 | std::string name; ///< Name of event (optional) | ||
| 38 | 37 | ||
| 39 | bool ShouldWait(Thread* thread) const override; | 38 | bool ShouldWait(Thread* thread) const override; |
| 40 | void Acquire(Thread* thread) override; | 39 | void Acquire(Thread* thread) override; |
| @@ -47,6 +46,11 @@ public: | |||
| 47 | private: | 46 | private: |
| 48 | Event(); | 47 | Event(); |
| 49 | ~Event() override; | 48 | ~Event() override; |
| 49 | |||
| 50 | ResetType reset_type; ///< Current ResetType | ||
| 51 | |||
| 52 | bool signaled; ///< Whether the event has already been signaled | ||
| 53 | std::string name; ///< Name of event (optional) | ||
| 50 | }; | 54 | }; |
| 51 | 55 | ||
| 52 | } // namespace Kernel | 56 | } // namespace Kernel |
diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index f5a5697a0..2acfdb8a9 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp | |||
| @@ -316,7 +316,7 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeEvent::GetChildren() const { | |||
| 316 | 316 | ||
| 317 | list.push_back(std::make_unique<WaitTreeText>( | 317 | list.push_back(std::make_unique<WaitTreeText>( |
| 318 | tr("reset type = %1") | 318 | tr("reset type = %1") |
| 319 | .arg(GetResetTypeQString(static_cast<const Kernel::Event&>(object).reset_type)))); | 319 | .arg(GetResetTypeQString(static_cast<const Kernel::Event&>(object).GetResetType())))); |
| 320 | return list; | 320 | return list; |
| 321 | } | 321 | } |
| 322 | 322 | ||