diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-08-25 14:52:44 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-08-25 14:52:44 +0200 |
| commit | 31709fca7175312c2ca12a4ad4161047e7be9a70 (patch) | |
| tree | 6d234ab88113fdcc187ca3de24256334de949709 /gui/src/renderer | |
| parent | ea84ed8adf01cf53d5065076634aac7e9ba7b903 (diff) | |
| parent | 356a01286b201a0919bc7fd7719387124b836ad9 (diff) | |
| download | mullvadvpn-31709fca7175312c2ca12a4ad4161047e7be9a70.tar.xz mullvadvpn-31709fca7175312c2ca12a4ad4161047e7be9a70.zip | |
Merge branch 'return-to-main-view-after-timeout'
Diffstat (limited to 'gui/src/renderer')
| -rw-r--r-- | gui/src/renderer/app.tsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index 277227eac7..54f843a6e0 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -205,6 +205,8 @@ export default class AppRenderer { this.reduxActions.userInterface.setWindowFocused(focus); }); + IpcRendererEventChannel.navigation.listenReset(() => this.history.dismiss(true)); + // Request the initial state from the main process const initialState = IpcRendererEventChannel.state.get(); |