From f16c55b0744436bc5b8833a38216a92135a0398c Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sun, 20 Feb 2011 14:42:39 +0000 Subject: [PATCH] Due to the changes in r40529, the resource data pointer was no longer pointing to static data. Consequently the locale kit would fail to load resources since the pointer was no longer an address within the liblocale.so image, with the result that things like flag bitmaps would no longer be accessible. Fixes #7246. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40580 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/locale/LocaleRoster.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kits/locale/LocaleRoster.cpp b/src/kits/locale/LocaleRoster.cpp index c9ee326963..351aa760aa 100644 --- a/src/kits/locale/LocaleRoster.cpp +++ b/src/kits/locale/LocaleRoster.cpp @@ -249,7 +249,7 @@ BLocaleRoster::GetFlagIconForCountry(BBitmap* flagIcon, const char* countryCode) return B_ERROR; if (!rosterData->fAreResourcesLoaded) { - status_t result = rosterData->fResources.SetToImage(rosterData); + status_t result = rosterData->fResources.SetToImage((const void *)&BLocaleRoster::Default); if (result != B_OK) return result;