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 #7646: incomplete cleanup for non-threaded world generation failure #7805

Merged
merged 1 commit into from Nov 14, 2019

Conversation

@glx22
Copy link
Contributor

glx22 commented Oct 26, 2019

The server won't crash but it will switch to menu, and non server mode.

I think more changes must be done to properly exit the server.

@James103
Copy link
Contributor

James103 commented Oct 26, 2019

Would it be possible to have the server retry a few times, and only then exit? This allows dedicated servers to retry generating a (small) map when it fails due to there being no towns.

@ldpl
Copy link
Contributor

ldpl commented Oct 26, 2019

This sounds terrible, does that also apply to dedicated servers? IMO swithing dedicated to a menu is even worse than crashing. Because if server crashes it can be easily restarted but if it just hangs in a menu server controller will have no idea what's going on.

@glx22 glx22 marked this pull request as ready for review Nov 2, 2019
@LordAro
Copy link
Member

LordAro commented Nov 3, 2019

Could probably do with a comment explaining why dedicated servers cause the game to exit

@glx22 glx22 force-pushed the glx22:fix_7646 branch from c19b764 to b2e9117 Nov 4, 2019
@LordAro LordAro merged commit ddffe32 into OpenTTD:master Nov 14, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20191104.4 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.9) Linux linux-amd64-clang-3.9 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
@glx22 glx22 deleted the glx22:fix_7646 branch Nov 16, 2019
douiwby added a commit to douiwby/OpenTTD that referenced this pull request Apr 16, 2020
spnda added a commit to spnda/OpenTTD that referenced this pull request Jun 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.