1 files changed, 4 insertions, 1 deletions
diff --git a/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp b/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp
index 4f096b812de..db2a00a304a 100644
--- a/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp
@@ -237,7 +237,10 @@ MachThreadList::UpdateThreadList(MachProcess *process, bool update)
                 {
                     // We don't have this thread, lets add it.
                     MachThreadSP threadSP(new MachThread(process, thread_list[idx]));
-                    currThreads.push_back(threadSP);
+                    // Make sure the thread is ready to be displayed and shown to users
+                    // before we add this thread to our list...
+                    if (threadSP->IsUserReady())
+                        currThreads.push_back(threadSP);
                 }
             }