From 001939166b95ff0b8a48f89ba6e3c74811c33ce8 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Mon, 5 Jun 2017 18:44:33 +0200 Subject: [PATCH] [Localization] Fix demos by locking the mutex only when necessary --- src/Components/Modules/Localization.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Components/Modules/Localization.cpp b/src/Components/Modules/Localization.cpp index 42aa1471..6c18412a 100644 --- a/src/Components/Modules/Localization.cpp +++ b/src/Components/Modules/Localization.cpp @@ -49,15 +49,17 @@ namespace Components if (!Localization::UseLocalization.get()) return key; Game::LocalizeEntry* entry = nullptr; - std::lock_guard _(Localization::LocalizeMutex); + { + std::lock_guard _(Localization::LocalizeMutex); - if (Localization::TempLocalizeMap.find(key) != Localization::TempLocalizeMap.end()) - { - entry = Localization::TempLocalizeMap[key]; - } - else if (Localization::LocalizeMap.find(key) != Localization::LocalizeMap.end()) - { - entry = Localization::LocalizeMap[key]; + if (Localization::TempLocalizeMap.find(key) != Localization::TempLocalizeMap.end()) + { + entry = Localization::TempLocalizeMap[key]; + } + else if (Localization::LocalizeMap.find(key) != Localization::LocalizeMap.end()) + { + entry = Localization::LocalizeMap[key]; + } } if (!entry || !entry->value)