Merged.

diff --git a/src/threads/thread.cpp b/src/threads/thread.cpp
index 57f8b5c0b1c862b3c8b342d0d74c4eb8d1f5991c..fefb4a34f662c6465c63b023f1d3416ccf01a849 100644 (file)
--- a/src/threads/thread.cpp
+++ b/src/threads/thread.cpp
@@ -1192,6 +1192,8 @@ bool threads_thread_is_alive(threadobject *t)
        case THREAD_STATE_BLOCKED:
        case THREAD_STATE_WAITING:
        case THREAD_STATE_TIMED_WAITING:
+       case THREAD_STATE_PARKED:
+       case THREAD_STATE_TIMED_PARKED:
                return true;
 
        default: