From 1b3935069d29b965a9d1d6798d9cf651319dbe87 Mon Sep 17 00:00:00 2001
From: ffulin <11589403+ffulin@users.noreply.github.com>
Date: Sat, 19 Aug 2023 12:26:25 +0930
Subject: [PATCH] Fix bad merge

---
 Code/Tools/FBuild/FBuildCore/Protocol/Server.cpp         | 9 ---------
 Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.cpp | 1 -
 Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.h   | 2 --
 3 files changed, 12 deletions(-)

diff --git a/Code/Tools/FBuild/FBuildCore/Protocol/Server.cpp b/Code/Tools/FBuild/FBuildCore/Protocol/Server.cpp
index fd2f81d49..aacc2bfba 100644
--- a/Code/Tools/FBuild/FBuildCore/Protocol/Server.cpp
+++ b/Code/Tools/FBuild/FBuildCore/Protocol/Server.cpp
@@ -613,15 +613,6 @@ void Server::FindNeedyClients()
     }
 
     PROFILE_FUNCTION;
-    
-    // determine job availability
-    int32_t availableJobs = (int32_t)WorkerThreadRemote::GetNumCPUsToUse();
-    if ( availableJobs == 0 )
-    {
-        return;
-    }
-    ++availableJobs; // over request to parallelize building/network transfers
-
 
     // determine job availability
     int32_t availableJobs = (int32_t)WorkerThreadRemote::GetNumCPUsToUse();
diff --git a/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.cpp b/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.cpp
index daf6b604b..88a6473d7 100644
--- a/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.cpp
+++ b/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.cpp
@@ -47,7 +47,6 @@ void WorkerThread::Init( ThreadPool * pool )
 WorkerThread::~WorkerThread()
 {
     ASSERT( m_Exited.Load() );
-    m_Thread.Join();
 }
 
 // InitTmpDir
diff --git a/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.h b/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.h
index 3149bed3f..a146fa5b2 100644
--- a/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.h
+++ b/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.h
@@ -8,7 +8,6 @@
 #include "Core/Process/Atomic.h"
 #include "Core/Process/Mutex.h"
 #include "Core/Process/Semaphore.h"
-#include "Core/Process/Thread.h"
 #include "Core/Strings/AStackString.h"
 #include "Core/Strings/AString.h"
 
@@ -51,7 +50,6 @@ class WorkerThread
     virtual void Main();
 
     // signal to exit thread
-    Thread        m_Thread;
     Atomic<bool>  m_ShouldExit;
     Atomic<bool>  m_Exited;
     uint16_t      m_ThreadIndex;