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.

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

Correct DST errors on Windows #59223

Merged
merged 1 commit into from
Mar 17, 2022
Merged

Correct DST errors on Windows #59223

merged 1 commit into from
Mar 17, 2022

Conversation

ztc0611
Copy link
Contributor

@ztc0611 ztc0611 commented Mar 17, 2022

The DST code on Windows for both was set to always return false in OS.get_datetime(), and reported the incorrect DST bias.

Fixes #59214 and Fixes #37571 for 4.0.

"Duplicate" due to me being confused as to how PRs work on multi-branch Github projects and submitting the other for 3.x.

@ztc0611 ztc0611 requested a review from a team as a code owner March 17, 2022 02:01
@bruvzg bruvzg added this to the 4.0 milestone Mar 17, 2022
platform/windows/os_windows.cpp Outdated Show resolved Hide resolved
platform/windows/os_windows.cpp Outdated Show resolved Hide resolved
platform/windows/os_windows.cpp Outdated Show resolved Hide resolved
Copy link
Member

@bruvzg bruvzg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll need to squash the commits into one (see https://docs.godotengine.org/en/latest/community/contributing/pr_workflow.html).

platform/windows/os_windows.cpp Outdated Show resolved Hide resolved
@ztc0611
Copy link
Contributor Author

ztc0611 commented Mar 17, 2022

Alright, I'll read how to do that, one moment. Severe apologies for how bad I am at PRs, this is my first time trying to contribute to a project of this scale.

@ztc0611 ztc0611 requested review from a team as code owners March 17, 2022 10:03
@ztc0611
Copy link
Contributor Author

ztc0611 commented Mar 17, 2022

Gah, I clearly messed up the rebase somewhere. I didn't want it to automatically flag for review yet.

@ztc0611 ztc0611 closed this Mar 17, 2022
@ztc0611 ztc0611 reopened this Mar 17, 2022
@akien-mga akien-mga removed request for a team March 17, 2022 11:17
@akien-mga akien-mga merged commit 5d806b4 into godotengine:master Mar 17, 2022
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

@akien-mga akien-mga modified the milestones: 4.0, 3.5 Mar 17, 2022
@akien-mga akien-mga added cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.4 labels Mar 17, 2022
@akien-mga
Copy link
Member

Cherry-picked for 3.5.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Mar 17, 2022
@akien-mga
Copy link
Member

Cherry-picked for 3.4.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants