Skip to content

Commit

Permalink
Merge #3246 Fix Netkan timezones again
Browse files Browse the repository at this point in the history
  • Loading branch information
HebaruSan committed Dec 21, 2020
2 parents 90fdf7a + 46c6e5f commit ad66e3c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.

- [GUI] Make Mono 6 builds work on Windows (#3218, #3219 by: HebaruSan; reviewed: DasSkelett)
- [Cmdline] Format installation errors for GitHub Actions in headless mode (#3239 by: HebaruSan; reviewed: DasSkelett)
- [Netkan] Fix Netkan timezones again (#3246 by: HebaruSan; reviewed: DasSkelett)

## v1.29.2 (Freedman)

Expand Down
7 changes: 3 additions & 4 deletions Netkan/Model/Metadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,10 @@ public Metadata(JObject json)
StagingReason = (string)stagingReasonToken;
}

JToken updatedToken;
DateTime t;
if (json.TryGetValue(UpdatedPropertyName, out updatedToken)
&& DateTime.TryParse(updatedToken.ToString(), out t))
JToken updatedToken;
if (json.TryGetValue(UpdatedPropertyName, out updatedToken))
{
DateTime t = (DateTime)updatedToken;
RemoteTimestamp = t.ToUniversalTime();
}
}
Expand Down

0 comments on commit ad66e3c

Please sign in to comment.