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

Don't force recreating the map object and associated layer state #2718

Merged
merged 3 commits into from
Dec 10, 2024

Conversation

simonpoole
Copy link
Collaborator

If Main has been destroyed, both the Map and Logic objects may still be available and current, so we now reuse them instead of forcing recreation.

This resolves race conditions that could be caused by selecting and loading files into layers via the system file picker that could lead to Main being removed.

@simonpoole simonpoole force-pushed the retain_map_object_if_it_still_exists branch 2 times, most recently from f77bd76 to 993074b Compare November 10, 2024 19:11
@simonpoole simonpoole force-pushed the retain_map_object_if_it_still_exists branch from 993074b to 86d40f6 Compare November 28, 2024 14:58
If Main has been destroyed, both the Map and Logic objects may still be
available and current, so we now reuse them instead of forcing
recreation.

This resolves race conditions that could be caused by selecting and
loading files into layers via the system file picker that could lead to
Main being removed.
@simonpoole simonpoole force-pushed the retain_map_object_if_it_still_exists branch from 86d40f6 to 69914ea Compare December 10, 2024 08:36
@simonpoole simonpoole force-pushed the retain_map_object_if_it_still_exists branch from 69914ea to e7c5089 Compare December 10, 2024 10:19
@simonpoole simonpoole force-pushed the retain_map_object_if_it_still_exists branch from ead348e to 34c9986 Compare December 10, 2024 17:39
@simonpoole simonpoole merged commit d79fcf3 into master Dec 10, 2024
2 checks passed
@simonpoole simonpoole deleted the retain_map_object_if_it_still_exists branch December 10, 2024 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant