From 2e48a13bfbea0ec59613140edb9d271148edbb2f Mon Sep 17 00:00:00 2001
From: yury <jura@cp-lab.com>
Date: Fri, 6 Nov 2020 15:43:19 +0000
Subject: [PATCH] * android: In some android versions time zone names are
 available only after first call of localtime().

git-svn-id: trunk@47329 -
---
 rtl/android/unixandroid.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rtl/android/unixandroid.inc b/rtl/android/unixandroid.inc
index 9932b77387..7f02c805a5 100644
--- a/rtl/android/unixandroid.inc
+++ b/rtl/android/unixandroid.inc
@@ -128,19 +128,19 @@ begin
   ReadTimeZoneFromLibC:=False;
   lTZInfo:=default(TTZInfo);
   lTZInfoEx:=default(TTZInfoEx);
-  lTZInfoEx.name[false]:=c_tzname[0];
-  lTZInfoEx.name[true]:=c_tzname[1];
   t:=fptime;
   tt:=localtime(@t);
   if tt <> nil then
     begin
+      lTZInfoEx.name[false]:=utf8string(c_tzname[0]);
+      lTZInfoEx.name[true]:=utf8string(c_tzname[1]);
       lTZInfo.daylight:=tt^.tm_isdst <> 0;
       lTZInfo.seconds:=tt^.tm_gmtoff;
       // ToDo: correct validsince/validuntil values
       lTZInfo.validsince:=low(lTZInfo.validsince);
       lTZInfo.validuntil:=high(lTZInfo.validuntil);
       SetTZInfo(lTZInfo, lTZInfoEx);
-      ReadTimeZoneFromLibC:=lTZInfoEx.name[false] <> '';
+      ReadTimeZoneFromLibC:=c_tzname[0] <> nil;
     end;
 end;