From ce12e9df6966e760db65df270eb041eb5bcc7b6a Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Mon, 3 Oct 2022 16:46:58 +0300
Subject: [PATCH] fix: Fix err check in DialWorkspaceAgentTailnet

---
 codersdk/workspaceagents.go | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
index 48c5743b7f894..687aa704e663b 100644
--- a/codersdk/workspaceagents.go
+++ b/codersdk/workspaceagents.go
@@ -331,22 +331,18 @@ func (c *Client) DialWorkspaceAgentTailnet(ctx context.Context, logger slog.Logg
 				// Need to disable compression to avoid a data-race.
 				CompressionMode: websocket.CompressionDisabled,
 			})
-			if errors.Is(err, context.Canceled) {
-				return
-			}
-			if isFirst {
-				if res.StatusCode == http.StatusConflict {
-					first <- readBodyAsError(res)
+			if err != nil {
+				if errors.Is(err, context.Canceled) {
 					return
 				}
-				isFirst = false
-				close(first)
-			}
-			if err != nil {
 				logger.Debug(ctx, "failed to dial", slog.Error(err))
 				continue
 			}
 			if isFirst {
+				if res.StatusCode == http.StatusConflict {
+					first <- readBodyAsError(res)
+					return
+				}
 				isFirst = false
 				close(first)
 			}