From 3d3cccb8e5cc66281d97ac9ffd98c21decf94b0e Mon Sep 17 00:00:00 2001 From: elsid Date: Fri, 3 Mar 2023 18:39:23 +0100 Subject: [PATCH] Fix clamping physics threads --- apps/openmw/mwphysics/mtphysics.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp index 190c0726f3..5f76548f36 100644 --- a/apps/openmw/mwphysics/mtphysics.cpp +++ b/apps/openmw/mwphysics/mtphysics.cpp @@ -330,8 +330,8 @@ namespace MWPhysics case LockingPolicy::ExclusiveLocksOnly: return 1; case LockingPolicy::AllowSharedLocks: - return static_cast(std::max( - getMaxBulletSupportedThreads(), Settings::Manager::getInt("async num threads", "Physics"))); + return static_cast(std::clamp( + Settings::Manager::getInt("async num threads", "Physics"), 0, getMaxBulletSupportedThreads())); } throw std::runtime_error("Unsupported LockingPolicy: " @@ -372,6 +372,7 @@ namespace MWPhysics { if (mNumThreads >= 1) { + Log(Debug::Info) << "Using " << mNumThreads << " async physics threads"; for (unsigned i = 0; i < mNumThreads; ++i) mThreads.emplace_back([&] { worker(); }); }