From 402925426309cc4c245270495a9d200dbd44176e Mon Sep 17 00:00:00 2001
From: Silent <CookiePLMonster@users.noreply.github.com>
Date: Wed, 1 Oct 2025 08:13:53 +0200
Subject: [PATCH] JobPool: Simplify lock guard objects (#25281)

---
 src/openrct2/core/JobPool.cpp | 10 +++++-----
 src/openrct2/core/JobPool.h   |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/openrct2/core/JobPool.cpp b/src/openrct2/core/JobPool.cpp
index 1b19137e92..f2f087c71d 100644
--- a/src/openrct2/core/JobPool.cpp
+++ b/src/openrct2/core/JobPool.cpp
@@ -29,7 +29,7 @@ JobPool::JobPool(size_t maxThreads)
 JobPool::~JobPool()
 {
     {
-        unique_lock lock(_mutex);
+        std::lock_guard lock(_mutex);
         _shouldStop = true;
     }
     _condPending.notify_all();
@@ -44,7 +44,7 @@ JobPool::~JobPool()
 void JobPool::AddTask(std::function<void()> workFn, std::function<void()> completionFn)
 {
     {
-        unique_lock lock(_mutex);
+        std::lock_guard lock(_mutex);
         _pending.emplace_back(workFn, completionFn);
     }
     _condPending.notify_one();
@@ -52,7 +52,7 @@ void JobPool::AddTask(std::function<void()> workFn, std::function<void()> comple
 
 void JobPool::Join(std::function<void()> reportFn)
 {
-    unique_lock lock(_mutex);
+    std::unique_lock lock(_mutex);
     while (true)
     {
         // Wait for the queue to become empty or having completed tasks.
@@ -93,13 +93,13 @@ void JobPool::Join(std::function<void()> reportFn)
 
 bool JobPool::IsBusy()
 {
-    unique_lock lock(_mutex);
+    std::lock_guard lock(_mutex);
     return _processing != 0 || !_pending.empty();
 }
 
 void JobPool::ProcessQueue()
 {
-    unique_lock lock(_mutex);
+    std::unique_lock lock(_mutex);
     do
     {
         // Wait for work or cancellation.
diff --git a/src/openrct2/core/JobPool.h b/src/openrct2/core/JobPool.h
index 94f76b8044..bc724ff309 100644
--- a/src/openrct2/core/JobPool.h
+++ b/src/openrct2/core/JobPool.h
@@ -36,8 +36,6 @@ private:
     std::condition_variable _condComplete;
     std::mutex _mutex;
 
-    using unique_lock = std::unique_lock<std::mutex>;
-
 public:
     JobPool(size_t maxThreads = 255);
     ~JobPool();