Fall back to default lang, when string is empty

diff --git a/WinMute/WMi18n.cpp b/WinMute/WMi18n.cpp
index 1dc093caf0af1d8e0df1f0d9e689584812665a57..a370adb938763139eabb5e910bec7a2325c754fd 100644 (file)
--- 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()) {