Skip to content

Commit 1e12465

Browse files
authored
Merge pull request #795 from Unity-Technologies/unity-master-tz-fix-build
Catch errors from CreateLocalUnity function
2 parents 22ca037 + 9500a30 commit 1e12465

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

mcs/class/corlib/System/TimeZoneInfo.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,15 @@ static TimeZoneInfo CreateLocal ()
170170
#endif
171171

172172
#if UNITY
173-
var localTimeZoneFallback = CreateLocalUnity();
174-
if(localTimeZoneFallback == null)
175-
localTimeZoneFallback = Utc;
173+
TimeZoneInfo localTimeZoneFallback = null;
174+
try {
175+
localTimeZoneFallback = CreateLocalUnity();
176+
} catch {
177+
localTimeZoneFallback = null;
178+
}
179+
180+
if (localTimeZoneFallback == null)
181+
localTimeZoneFallback = Utc;
176182
#endif
177183

178184
var tz = Environment.GetEnvironmentVariable ("TZ");

0 commit comments

Comments
 (0)