summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/thread.cpp5
-rw-r--r--src/core/hle/kernel/thread.h1
2 files changed, 0 insertions, 6 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 3abe12810..7d1eb2c6e 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -88,10 +88,6 @@ void Thread::ResumeFromWait() {
88 // before actually resuming. We can ignore subsequent wakeups if the thread status has 88 // before actually resuming. We can ignore subsequent wakeups if the thread status has
89 // already been set to ThreadStatus::Ready. 89 // already been set to ThreadStatus::Ready.
90 return; 90 return;
91
92 case ThreadStatus::Running:
93 DEBUG_ASSERT_MSG(false, "Thread with object id {} has already resumed.", GetObjectId());
94 return;
95 case ThreadStatus::Dead: 91 case ThreadStatus::Dead:
96 // This should never happen, as threads must complete before being stopped. 92 // This should never happen, as threads must complete before being stopped.
97 DEBUG_ASSERT_MSG(false, "Thread with object id {} cannot be resumed because it's DEAD.", 93 DEBUG_ASSERT_MSG(false, "Thread with object id {} cannot be resumed because it's DEAD.",
@@ -260,7 +256,6 @@ void Thread::SetStatus(ThreadStatus new_status) {
260 256
261 switch (new_status) { 257 switch (new_status) {
262 case ThreadStatus::Ready: 258 case ThreadStatus::Ready:
263 case ThreadStatus::Running:
264 SetSchedulingStatus(ThreadSchedStatus::Runnable); 259 SetSchedulingStatus(ThreadSchedStatus::Runnable);
265 break; 260 break;
266 case ThreadStatus::Dormant: 261 case ThreadStatus::Dormant:
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 20e86fb81..a75071e9b 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -72,7 +72,6 @@ enum ThreadProcessorId : s32 {
72}; 72};
73 73
74enum class ThreadStatus { 74enum class ThreadStatus {
75 Running, ///< Currently running
76 Ready, ///< Ready to run 75 Ready, ///< Ready to run
77 Paused, ///< Paused by SetThreadActivity or debug 76 Paused, ///< Paused by SetThreadActivity or debug
78 WaitHLEEvent, ///< Waiting for hle event to finish 77 WaitHLEEvent, ///< Waiting for hle event to finish