1 files changed, 2 insertions, 5 deletions
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
index 7cef02e5002..eea7655fd09 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -634,7 +634,7 @@ Error
 GDBRemoteCommunication::StartListenThread (const char *hostname, uint16_t port)
 {
     Error error;
-    if (m_listen_thread.GetState() == eThreadStateRunning)
+    if (m_listen_thread.IsJoinable())
     {
         error.SetErrorString("listen thread already running");
     }
@@ -655,11 +655,8 @@ GDBRemoteCommunication::StartListenThread (const char *hostname, uint16_t port)
 bool
 GDBRemoteCommunication::JoinListenThread ()
 {
-    if (m_listen_thread.GetState() == eThreadStateRunning)
-    {
+    if (m_listen_thread.IsJoinable())
         m_listen_thread.Join(nullptr);
-        m_listen_thread.Reset();
-    }
     return true;
 }