From bb67d95669fce8f95c21df033dc1513267680873 Mon Sep 17 00:00:00 2001 From: Xavier Michelon Date: Wed, 27 Sep 2023 18:23:02 +0200 Subject: [PATCH] fix(GODT-2967): tray menu entries close the setup wizard when needed. --- .../frontend/bridge-gui/bridge-gui/qml/MainWindow.qml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml b/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml index dcb9b5b7..a1e06bbd 100644 --- a/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml +++ b/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml @@ -106,18 +106,28 @@ ApplicationWindow { Connections { function onSelectUser(userID, forceShowWindow) { contentWrapper.selectUser(userID); + if (setupWizard.visible) { + setupWizard.closeWizard() + } if (forceShowWindow) { root.showAndRise(); } } function onShowHelp() { root.showHelp(); + if (setupWizard.visible) { + setupWizard.closeWizard() + } + root.showAndRise(); } function onShowMainWindow() { root.showAndRise(); } function onShowSettings() { + if (setupWizard.visible) { + setupWizard.closeWizard() + } root.showSettings(); root.showAndRise(); }