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

Fix d437445c: also use std::chrono for the GRFFileScanner modal window #8699

Merged
merged 2 commits into from Feb 19, 2021

Conversation

@TrueBrain
Copy link
Member

@TrueBrain TrueBrain commented Feb 19, 2021

Fixes #8697

Motivation / Problem

In some weird moment of insanity, I converted one of the two modal windows to use std::chrono, but forgot to convert the other. No clue where the brainfart came from, but here we are.

Description

Fixes hanging screen during NewGRF Scans.

As bonus, made the code look more similar between those two windows .. for some reason someone decided to go the completely different direction for the second :P

Additionally, just because I am too lazy to make an extra PR out of it, run the CI against LibSDL2 and LibSDL1.2.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')
TrueBrain added 2 commits Feb 19, 2021
For some reason I only converted one of the two modal windows we
have, and completely forgot the other.

While at it, synchronize the way those two modal windows work
in terms of "next_update".
glx22
glx22 approved these changes Feb 19, 2021
Copy link
Contributor

@glx22 glx22 left a comment

Modal window works again \o/

@TrueBrain TrueBrain merged commit b124c49 into OpenTTD:master Feb 19, 2021
11 checks passed
@TrueBrain TrueBrain deleted the fix-60fps-again branch Feb 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants