From 054d9b3f09e8d90d078b58a6c2955b7e2f7328f9 Mon Sep 17 00:00:00 2001 From: Romain LE JEUNE Date: Fri, 18 Nov 2022 16:14:44 +0100 Subject: [PATCH] GODT-2111: Properly reset crash counter + remove additional Quit call. --- internal/frontend/bridge-gui/bridge-gui/QMLBackend.cpp | 1 - pkg/restarter/restarter.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/frontend/bridge-gui/bridge-gui/QMLBackend.cpp b/internal/frontend/bridge-gui/bridge-gui/QMLBackend.cpp index 2be4b6ee..6f904742 100644 --- a/internal/frontend/bridge-gui/bridge-gui/QMLBackend.cpp +++ b/internal/frontend/bridge-gui/bridge-gui/QMLBackend.cpp @@ -271,7 +271,6 @@ void QMLBackend::quit() void QMLBackend::restart() { app().grpc().restart(); - app().grpc().quit(); } diff --git a/pkg/restarter/restarter.go b/pkg/restarter/restarter.go index 2e9d17e8..1ff33afa 100644 --- a/pkg/restarter/restarter.go +++ b/pkg/restarter/restarter.go @@ -69,7 +69,7 @@ func (restarter *Restarter) Restart() { if restarter.crash { env[BridgeCrashCount] = increment(env[BridgeCrashCount]) } else { - delete(env, BridgeCrashCount) + env[BridgeCrashCount] = "0" } cmd := execabs.Command(restarter.exe, xslices.Join(removeFlagWithValue(os.Args[1:], "parent-pid"), restarter.flags)...) //nolint:gosec