From 89915e35bdaf698e195fe82d79021c50bc8ecd92 Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Mon, 11 Jan 2021 13:17:22 +0300 Subject: [PATCH] Pull request: fix beta client bug Merge in DNS/adguard-home from beta-client-bug to master Squashed commit of the following: commit 641f8b5eb3827e1fd9b15e60773e365206dc1f49 Author: Eugene Burkov Date: Mon Jan 11 11:54:17 2021 +0300 home: fix beta client bug --- internal/home/controlinstall.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/home/controlinstall.go b/internal/home/controlinstall.go index 3920af3c..7d67d140 100644 --- a/internal/home/controlinstall.go +++ b/internal/home/controlinstall.go @@ -371,9 +371,11 @@ func (web *Web) handleInstallConfigure(w http.ResponseWriter, r *http.Request) { go func() { _ = web.httpServer.Shutdown(context.TODO()) }() - go func() { - _ = web.httpServerBeta.Shutdown(context.TODO()) - }() + if web.httpServerBeta != nil { + go func() { + _ = web.httpServerBeta.Shutdown(context.TODO()) + }() + } } }