From: lx-s <lx-s@users.noreply.github.com>
Date: Tue, 19 Dec 2023 07:51:56 +0000 (+0100)
Subject: Fall back to default lang, when string is empty
X-Git-Tag: 2.4.9.0~28
X-Git-Url: https://repos.lx-s.de/gitweb/?a=commitdiff_plain;h=1b9eddbda1c041285d3b173f8e329efb5a0a3626;p=winmute.git

Fall back to default lang, when string is empty
---

diff --git a/WinMute/WMi18n.cpp b/WinMute/WMi18n.cpp
index 1dc093c..a370adb 100644
--- a/WinMute/WMi18n.cpp
+++ b/WinMute/WMi18n.cpp
@@ -201,19 +201,17 @@ void WMi18n::UnloadLanguage()
 std::wstring WMi18n::GetTranslationW(const std::string& textId) const
 {
    std::wstring text;
-   {
-      const std::lock_guard lock(langMutex_);
-      if (!loadedLang_.empty() && loadedLang_.contains(textId)) {
-         auto it = loadedLang_.find(textId);
-         if (it != loadedLang_.end()) {
-            text = it->second;
-         }
+   const std::lock_guard lock(langMutex_);
+   if (!loadedLang_.empty() && loadedLang_.contains(textId)) {
+      auto it = loadedLang_.find(textId);
+      if (it != loadedLang_.end() && !it->second.empty()) {
+         text = it->second;
       }
-      if (text.empty() && defaultLang_.contains(textId)) {
-         auto it = defaultLang_.find(textId);
-         if (it != defaultLang_.cend()) {
-            text = it->second;
-         }
+   }
+   if (text.empty() && defaultLang_.contains(textId)) {
+      auto it = defaultLang_.find(textId);
+      if (it != defaultLang_.cend() && !it->second.empty()) {
+         text = it->second;
       }
    }
    if (text.empty()) {