Fix Android freeze when discarding changes on close#2
Merged
Conversation
In mobile mode, map_widget lives inside a container_widget (QVBoxLayout with bottom_action_bar). MapEditorController::detach() was calling setCentralWidget(nullptr), which does nothing because QStackedWidget ignores null, and then deleting map_widget individually, leaving a dangling pointer in the container's layout. When the app later left fullscreen mode, resize events reached the stale container and accessed freed memory, causing a freeze. Fix: pass a new empty QWidget to setCentralWidget() so the old container is properly removed from the QStackedWidget and scheduled for deletion. Also change the cleanup loop in MainWindow::setCentralWidget() from `if` to `while` to handle edge cases with multiple stacked widgets. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
setCentralWidget(nullptr)is a no-op (QStackedWidget ignores null), leaving the old container widget with a dangling pointer to the deleted map_widget. Resize events from leaving fullscreen then access freed memory.setCentralWidget(nullptr)+delete map_widgetwithsetCentralWidget(new QWidget())+map_widget = nullptrso the old container is properly evicted and scheduled for deletionMainWindow::setCentralWidget()fromiftowhilefor robustnessTest plan
🤖 Generated with Claude Code