diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2023-11-17 15:56:35 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2023-11-17 15:56:35 +0100 |
| commit | df8e5ecbe9fd57b4991c8b0ed67abb12db7ace87 (patch) | |
| tree | e31e9ad175b3542959669a67fa41ff1aaddf4987 | |
| parent | 615a6e44e3891c0018e665f40d51f528e74760bc (diff) | |
| parent | 64e877cdf0f558c99dd9ed53f8cfe7252256234d (diff) | |
| download | mullvadvpn-df8e5ecbe9fd57b4991c8b0ed67abb12db7ace87.tar.xz mullvadvpn-df8e5ecbe9fd57b4991c8b0ed67abb12db7ace87.zip | |
Merge branch 'app-freezing-when-navigation-multiple-times-in-quick-des-467'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | gui/src/renderer/components/TransitionContainer.tsx | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index adc4ceee3c..45ddb8fbb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ Line wrap the file at 100 chars. Th - Lower risk of being rate limited. - Fix error dialog when failing to write to console by handling the thrown error. - Fix error dialog displayed when the daemon was killed. +- Fix desktop app freezing when navigations occur in very quick succession. #### Windows - Correctly detect whether OS is Windows Server (primarily for logging in daemon.log). diff --git a/gui/src/renderer/components/TransitionContainer.tsx b/gui/src/renderer/components/TransitionContainer.tsx index b9a60185ed..3e7007e3c8 100644 --- a/gui/src/renderer/components/TransitionContainer.tsx +++ b/gui/src/renderer/components/TransitionContainer.tsx @@ -179,7 +179,7 @@ export default class TransitionContainer extends React.Component<IProps, IState> if (candidate && this.state.currentItem) { // Update currentItem, nextItem, queuedItem depending on which the candidate matches. if ( - !this.isTransitioning && + !this.isCycling && this.state.currentItem.view.props.routePath === candidate.props.routePath ) { // There's no transition in progress and the newest candidate has the same path as the @@ -196,7 +196,7 @@ export default class TransitionContainer extends React.Component<IProps, IState> }, () => (this.isCycling = false), ); - } else if (!this.isTransitioning && this.state.nextItem) { + } else if (!this.isCycling && this.state.nextItem) { // There's no transition in progress but there is a next item. Abort the transition and add // the candidate to the queue. The app shouldn't start a transition if there is another view // to queue. |