From b424929fce4c36662076826ca6013747ed2829d0 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 1 Dec 2025 17:02:28 +0100
Subject: [PATCH] Address feedback

---
 components/l10n/messagebundles.cpp            | 46 +++++++++++--------
 .../scripts/omw/playerskillhandlers.lua       |  4 +-
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/components/l10n/messagebundles.cpp b/components/l10n/messagebundles.cpp
index 7a0799f21d..b1ccbd6b47 100644
--- a/components/l10n/messagebundles.cpp
+++ b/components/l10n/messagebundles.cpp
@@ -214,6 +214,19 @@ namespace L10n
             result.toUTF8String(resultString);
             return resultString;
         }
+
+        const icu::MessageFormat* getMessage(
+            const StringMap<StringMap<icu::MessageFormat>>& bundles, std::string_view key, std::string_view localeName)
+        {
+            auto iter = bundles.find(localeName);
+            if (iter != bundles.end())
+            {
+                auto message = iter->second.find(key);
+                if (message != iter->second.end())
+                    return &(message->second);
+            }
+            return nullptr;
+        }
     }
 
     MessageBundles::MessageBundles(const std::vector<icu::Locale>& preferredLocales, icu::Locale& fallbackLocale)
@@ -260,15 +273,9 @@ namespace L10n
     {
         std::shared_lock sharedLock(mMutex);
         {
-            auto iter = mBundles.find(localeName);
-            if (iter != mBundles.end())
-            {
-                auto message = iter->second.find(key);
-                if (message != iter->second.end())
-                {
-                    return &(message->second);
-                }
-            }
+            auto message = getMessage(mBundles, key, localeName);
+            if (message != nullptr)
+                return message;
         }
         if (localeName == "gmst" && mGmstLoader)
         {
@@ -277,17 +284,18 @@ namespace L10n
             sharedLock.unlock();
             std::unique_lock lock(mMutex);
             auto found = mGmsts.find(key);
-            if (found != mGmsts.end())
+            // Another thread deleted the key, retry mBundles
+            if (found == mGmsts.end())
+                return getMessage(mBundles, key, localeName);
+            // We're the first thread to resolve this key
+            auto message = convertToMessageFormat(key, found->second, mGmstLoader);
+            mGmsts.erase(found);
+            if (message)
             {
-                auto message = convertToMessageFormat(key, found->second, mGmstLoader);
-                mGmsts.erase(found);
-                if (message)
-                {
-                    auto iter = mBundles.find(localeName);
-                    if (iter == mBundles.end())
-                        iter = mBundles.emplace(localeName, StringMap<icu::MessageFormat>()).first;
-                    return &iter->second.emplace(key, *message).first->second;
-                }
+                auto iter = mBundles.find(localeName);
+                if (iter == mBundles.end())
+                    iter = mBundles.emplace(localeName, StringMap<icu::MessageFormat>()).first;
+                return &iter->second.emplace(key, *message).first->second;
             }
         }
         return nullptr;
diff --git a/files/data-mw/scripts/omw/playerskillhandlers.lua b/files/data-mw/scripts/omw/playerskillhandlers.lua
index 14fc1c6bbf..856f83cf4b 100644
--- a/files/data-mw/scripts/omw/playerskillhandlers.lua
+++ b/files/data-mw/scripts/omw/playerskillhandlers.lua
@@ -90,7 +90,7 @@ local function skillLevelUpHandler(skillid, source, params)
 
     if params.levelUpSpecialization and params.levelUpSpecializationIncreaseValue then
         levelStat.skillIncreasesForSpecialization[params.levelUpSpecialization]
-            = levelStat.skillIncreasesForSpecialization[params.levelUpSpecialization] + params.levelUpSpecializationIncreaseValue;
+            = levelStat.skillIncreasesForSpecialization[params.levelUpSpecialization] + params.levelUpSpecializationIncreaseValue
     end
 
     if source ~= 'jail' then
@@ -135,7 +135,7 @@ local function jailTimeServed(days)
         I.SkillProgression.skillLevelUp(skillid, I.SkillProgression.SKILL_INCREASE_SOURCES.Jail)
     end
 
-    local message = mechanicsL10n('ReleasedFromPrison', { days = days });
+    local message = mechanicsL10n('ReleasedFromPrison', { days = days })
     for skillid, skillStat in pairs(NPC.stats.skills) do
         local diff = skillStat(self).base - oldSkillLevels[skillid]
         if diff ~= 0 then