Fix connecting error after connection cancel#1174
Merged
1Blademaster merged 1 commit intoApr 20, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adjusts the connection modal close/cancel behavior in the GCS navbar to avoid triggering connection-state issues when a user cancels an in-progress connection attempt.
Changes:
- Centralized modal close/cancel logic into
handleConnectionModalCloseOrCancel. - When
connectingis true, close/cancel now dispatchesemitDisconnectFromDrone()(which maps tocancel_connect_to_drone) without immediately forcingconnecting/modal state changes. - Reused the shared handler for both the Mantine
ModalonCloseand the “Cancel/Close” button.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
1Blademaster
deleted the
1173-bug-drone-in-connection-error-after-cancelling-connection
branch
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
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.
No description provided.