Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MutableLocaleRoster::LoadCatalog logic

Browse Source 
* It should always try loading parent language.

Change-Id: I3af14beef70a41242d09b11f09abf749ac92e588
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3802
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
Kacper Kasper 2021-03-17 00:06:41 +01:00 committed by Adrien Destugues
parent 645c3796d7
commit 8534484314
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/kits/locale/MutableLocaleRoster.cpp
View File

@ -289,17 +289,17 @@ MutableLocaleRoster::LoadCatalog(const char* signature,
for (int32 l = 0; languages.FindString("language", l, &lang) == B_OK; ++l) { for (int32 l = 0; languages.FindString("language", l, &lang) == B_OK; ++l) {
catalog = new (std::nothrow) BPrivate::DefaultCatalog(NULL, signature, catalog = new (std::nothrow) BPrivate::DefaultCatalog(NULL, signature,
lang); lang);
if (catalog == NULL)
continue;
if (catalog->InitCheck() != B_OK if (catalog != NULL) {
|| catalog->ReadFromStandardLocations() != B_OK) { if (catalog->InitCheck() != B_OK
delete catalog; || catalog->ReadFromStandardLocations() != B_OK) {
continue; delete catalog;
catalog = NULL;
} else {
defaultCatalogInfo->fLoadedCatalogs.AddItem(catalog);
}
} }
defaultCatalogInfo->fLoadedCatalogs.AddItem(catalog);
// Chain-load catalogs for languages that depend on // Chain-load catalogs for languages that depend on
// other languages. // other languages.
// The current implementation uses the filename in order to // The current implementation uses the filename in order to