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 #10087: crash loading a save with corrupt peeps #10122

Merged
merged 1 commit into from Nov 9, 2019

Conversation

@ZehMatt
Copy link
Contributor

ZehMatt commented Oct 20, 2019

I'm not exactly sure how the peep got corrupted but it may have been a cause from the recent regression we had from the export/import bugs. The crash happens because current_ride != RIDE_ID_NULL but the ride its self doesn't exist. I wasn't sure if setting the current_ride back to RIDE_ID_NULL would be enough to prevent further crashes so instead it adds it to the removal list.

@ZehMatt ZehMatt force-pushed the ZehMatt:fix-10087 branch from dbbbf22 to 4ae5b9f Oct 20, 2019
@Gymnasiast

This comment has been minimized.

Copy link
Member

Gymnasiast commented Oct 20, 2019

I am not happy with removing peeps if we can help it. Resetting to RIDE_ID_NULL would be much preferable in my opinion.

@ZehMatt

This comment has been minimized.

Copy link
Contributor Author

ZehMatt commented Oct 20, 2019

I agree but can also not validate that the peep will not have other effects, I can just reset the ride and see what comes out I guess?

@ZehMatt ZehMatt force-pushed the ZehMatt:fix-10087 branch from 4ae5b9f to f2a3211 Nov 8, 2019
@ZehMatt ZehMatt requested a review from Gymnasiast Nov 8, 2019
@Gymnasiast Gymnasiast merged commit 9b499ea into OpenRCT2:develop Nov 9, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ZehMatt ZehMatt deleted the ZehMatt:fix-10087 branch Nov 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.