Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in translations code when no translations are found

Browse Source 
Fix another regression in wxTranslations in 3.1.2 and check that the
vector of acceptable translations is not empty before using its first
element.

Closes https://github.com/wxWidgets/wxWidgets/pull/1082

Closes #18299.
This commit is contained in:
Tomasz Słodkowicz
2018-12-17 04:38:35 +01:00
committed by Vadim Zeitlin
parent 14e905858d
commit 80904d1bc7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/translation.cpp
View File

@@ -1676,9 +1676,9 @@ wxString wxTranslations::GetBestTranslation(const wxString& domain,
const wxString& msgIdLanguage) const wxString& msgIdLanguage)
{ {
const wxArrayString allGoodOnes = GetAcceptableTranslations(domain, msgIdLanguage); const wxArrayString allGoodOnes = GetAcceptableTranslations(domain, msgIdLanguage);
wxString best(allGoodOnes.empty() ? wxString() : allGoodOnes[0]);
wxLogTrace(TRACE_I18N, " => using language '%s'", allGoodOnes[0]); wxLogTrace(TRACE_I18N, " => using language '%s'", best);
return allGoodOnes[0]; return best;
} }
wxArrayString wxTranslations::GetAcceptableTranslations(const wxString& domain, wxArrayString wxTranslations::GetAcceptableTranslations(const wxString& domain,