Skip to content

Fix connecting error after connection cancel #1174

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.

Sign up for GitHub

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

Merged
1Blademaster merged 1 commit into from
Apr 20, 2026
Merged

Fix connecting error after connection cancel #1174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions gcs/src/components/navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@ export default function Navbar() {
const connectToDroneFromButtonCallback = useConnectToDroneFromButtonCallback()
const disconnectFromDroneCallback = useDisconnectFromDroneCallback()

function handleConnectionModalCloseOrCancel() {
if (connecting) {
dispatch(emitDisconnectFromDrone())
return
}

dispatch(setConnectionModal(false))
}

function connectToDrone(type) {
if (type === ConnectionType.Serial) {
dispatch(
Expand Down Expand Up @@ -169,13 +178,7 @@ export default function Navbar() {
{/* Connect to drone modal - should probably be moved into its own component? */}
<Modal
opened={openedModal}
onClose={() => {
if (connecting) {
dispatch(emitDisconnectFromDrone())
}
dispatch(setConnectionModal(false))
dispatch(setConnecting(false))
}}
onClose={handleConnectionModalCloseOrCancel}
title="Connect to aircraft"
centered
overlayProps={{
Expand Down Expand Up @@ -300,13 +303,7 @@ export default function Navbar() {
<Button
variant="filled"
color={"red"}
onClick={() => {
if (connecting) {
dispatch(emitDisconnectFromDrone())
}
dispatch(setConnectionModal(false))
dispatch(setConnecting(false))
}}
onClick={handleConnectionModalCloseOrCancel}
>
{connecting ? "Cancel" : "Close"}
</Button>
Expand Down
Loading