From 5dba18c853b4be18823ac003d043c06a21d7769a Mon Sep 17 00:00:00 2001
From: stffabi <stffabi@users.noreply.github.com>
Date: Mon, 13 Mar 2023 08:12:09 +0100
Subject: [PATCH] [dev] Fix panic in devserver when using the logger (#2481)

---
 v2/internal/frontend/devserver/devserver.go | 9 +++++----
 website/src/pages/changelog.mdx             | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/v2/internal/frontend/devserver/devserver.go b/v2/internal/frontend/devserver/devserver.go
index 8d5003c60..47dde2953 100644
--- a/v2/internal/frontend/devserver/devserver.go
+++ b/v2/internal/frontend/devserver/devserver.go
@@ -62,9 +62,13 @@ func (d *DevWebServer) Run(ctx context.Context) error {
 		return err
 	}
 
+	var myLogger assetserver.Logger
+	if _logger := ctx.Value("logger"); _logger != nil {
+		myLogger = _logger.(*logger.Logger)
+	}
+
 	var assetHandler http.Handler
 	var wsHandler http.Handler
-	var myLogger *logger.Logger
 
 	_fronendDevServerURL, _ := ctx.Value("frontenddevserverurl").(string)
 	if _fronendDevServerURL == "" {
@@ -73,9 +77,6 @@ func (d *DevWebServer) Run(ctx context.Context) error {
 			return c.String(http.StatusOK, assetdir)
 		})
 
-		if _logger := ctx.Value("logger"); _logger != nil {
-			myLogger = _logger.(*logger.Logger)
-		}
 		var err error
 		assetHandler, err = assetserver.NewAssetHandler(assetServerConfig, myLogger)
 		if err != nil {
diff --git a/website/src/pages/changelog.mdx b/website/src/pages/changelog.mdx
index 7034e785a..344af2774 100644
--- a/website/src/pages/changelog.mdx
+++ b/website/src/pages/changelog.mdx
@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fixed panic when using `wails dev` and the AssetServer tried to log to the logger. Fixed by @stffabi in [PR](https://github.com/wailsapp/wails/pull/2481) 
+
 ## v2.4.0 - 2022-03-08
 
 ### Added