From 0801e0512d8a0d93fe278998c3e5ed1365b2249e Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 27 Jul 2025 18:15:19 +0200
Subject: [PATCH] Do thread safe local static based initialization

---
 apps/openmw/mwgui/mapwindow.cpp       | 8 +++-----
 apps/openmw/mwrender/npcanimation.cpp | 8 +++-----
 apps/openmw/mwrender/ripples.cpp      | 3 +--
 apps/openmw/mwsound/ffmpegdecoder.cpp | 8 +++-----
 apps/openmw/mwworld/scene.cpp         | 3 +--
 components/sceneutil/depth.hpp        | 9 +++------
 6 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 59d21886dc..51a765442a 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -774,12 +774,10 @@ namespace MWGui
         , mGlobalMapRender(std::make_unique<MWRender::GlobalMap>(localMapRender->getRoot(), workQueue))
         , mEditNoteDialog()
     {
-        static bool registered = false;
-        if (!registered)
-        {
+        [[maybe_unused]] static const bool registered = [] {
             MyGUI::FactoryManager::getInstance().registerFactory<MarkerWidget>("Widget");
-            registered = true;
-        }
+            return true;
+        }();
 
         mEditNoteDialog.setVisible(false);
         mEditNoteDialog.eventOkClicked += MyGUI::newDelegate(this, &MapWindow::onNoteEditOk);
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index c14eee27e4..4aface83d6 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -401,14 +401,12 @@ namespace MWRender
     {
         if (mViewMode == VM_FirstPerson)
         {
-            static bool prototypeAdded = false;
-            if (!prototypeAdded)
-            {
+            [[maybe_unused]] static const bool prototypeAdded = [&] {
                 osg::ref_ptr<osgUtil::RenderBin> depthClearBin(new osgUtil::RenderBin);
                 depthClearBin->setDrawCallback(new DepthClearCallback());
                 osgUtil::RenderBin::addRenderBinPrototype("DepthClear", depthClearBin);
-                prototypeAdded = true;
-            }
+                return true;
+            }();
             mObjectRoot->getOrCreateStateSet()->setRenderBinDetails(
                 RenderBin_FirstPerson, "DepthClear", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
         }
diff --git a/apps/openmw/mwrender/ripples.cpp b/apps/openmw/mwrender/ripples.cpp
index ab982d0c55..b19863d695 100644
--- a/apps/openmw/mwrender/ripples.cpp
+++ b/apps/openmw/mwrender/ripples.cpp
@@ -88,14 +88,13 @@ namespace MWRender
 
         if (mProgramBlobber != nullptr)
         {
-            static bool pipelineLogged = [&] {
+            [[maybe_unused]] static const bool pipelineLogged = [&] {
                 if (mUseCompute)
                     Log(Debug::Info) << "Initialized compute shader pipeline for water ripples";
                 else
                     Log(Debug::Info) << "Initialized fallback fragment shader pipeline for water ripples";
                 return true;
             }();
-            (void)pipelineLogged;
         }
 
         setCullCallback(new osg::NodeCallback);
diff --git a/apps/openmw/mwsound/ffmpegdecoder.cpp b/apps/openmw/mwsound/ffmpegdecoder.cpp
index 5a0f336a93..f8b40ddabb 100644
--- a/apps/openmw/mwsound/ffmpegdecoder.cpp
+++ b/apps/openmw/mwsound/ffmpegdecoder.cpp
@@ -522,16 +522,14 @@ namespace MWSound
 
         /* We need to make sure ffmpeg is initialized. Optionally silence warning
          * output from the lib */
-        static bool done_init = false;
-        if (!done_init)
-        {
+        [[maybe_unused]] static const bool doneInit = [] {
 // This is not needed anymore above FFMpeg version 4.0
 #if LIBAVCODEC_VERSION_INT < 3805796
             av_register_all();
 #endif
             av_log_set_level(AV_LOG_ERROR);
-            done_init = true;
-        }
+            return true;
+        }();
     }
 
     FFmpegDecoder::~FFmpegDecoder()
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 0c9a13bc47..1a68142c15 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -1273,13 +1273,12 @@ namespace MWWorld
         const std::size_t leftCapacity = mPreloader->getMaxCacheSize() - mPreloader->getCacheSize();
         if (cells.size() > leftCapacity)
         {
-            static bool logged = [&] {
+            [[maybe_unused]] static const bool logged = [&] {
                 Log(Debug::Warning) << "Not enough cell preloader cache capacity to preload exterior cells, consider "
                                        "increasing \"preload cell cache max\" up to "
                                     << (mPreloader->getCacheSize() + cells.size());
                 return true;
             }();
-            (void)logged;
             cells.resize(leftCapacity);
         }
 
diff --git a/components/sceneutil/depth.hpp b/components/sceneutil/depth.hpp
index a9f99b145f..b9004c457f 100644
--- a/components/sceneutil/depth.hpp
+++ b/components/sceneutil/depth.hpp
@@ -95,13 +95,10 @@ namespace SceneUtil
 
         static void setReversed(bool reverseZ)
         {
-            static bool init = false;
-
-            if (!init)
-            {
+            [[maybe_unused]] static const bool init = [&] {
                 AutoDepth::sReversed = reverseZ;
-                init = true;
-            }
+                return true;
+            }();
         }
 
         static bool isReversed()