Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix time zone ID handling. #1

Closed
wants to merge 1 commit into from
Closed

Fix time zone ID handling. #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions mcs/class/corlib/System/TimeZoneInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,16 @@ static TimeZoneInfo CreateLocal ()
{
#if WIN_PLATFORM
if (IsWindows && LocalZoneKey != null) {
/* Wine Mono hack: Wine doesn't set TimeZoneKeyName, so use
string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName");
name = TrimSpecial (name);
if (name != null && name != "")
return TimeZoneInfo.FindSystemTimeZoneById (name);

/* Wine Mono hack: Wine < 3.7 doesn't set TimeZoneKeyName, so use
GetTimeZoneInformation to get the name. This may not quite be
correct because StandardName isn't the same as TimeZoneKeyName,
but it is for all builtin Wine timezones at least.
but it is for all builtin Wine timezones at least. */

string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName");
name = TrimSpecial (name);
if (name != null) */
_TIME_ZONE_INFORMATION tzi;
if (GetTimeZoneInformation(out tzi) <= 2)
return TimeZoneInfo.FindSystemTimeZoneById (tzi.StandardName);
Expand Down