Skip to content

[FIX] Cancelling when adding a server #4565

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
reinaldonetof merged 3 commits into from
Nov 1, 2022
Merged

[FIX] Cancelling when adding a server #4565

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0731f6c
TC-110 [FIX] Cancelling when adding a server
reinaldonetof Sep 27, 2022
8f1aff6
Removing the close button when connecting to a server
reinaldonetof Sep 28, 2022
89782aa
Merge branch 'develop' into fix.cancelling-auto-login
reinaldonetof Nov 1, 2022
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
7 changes: 6 additions & 1 deletion app/views/NewServerView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,12 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
};

close = () => {
const { dispatch, previousServer } = this.props;
const { dispatch, previousServer, connecting } = this.props;

if (connecting) {
return;
}

dispatch(inviteLinksClear());
if (previousServer) {
dispatch(selectServerRequest(previousServer));
Expand Down