From dacea399ab4647a69cbddcc7ac6022e6af926309 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Tue, 7 Sep 2021 07:06:58 +1000 Subject: [PATCH] [v2] Refactor assets type --- .../frontend/desktop/windows/frontend.go | 18 ++++++++---------- v2/pkg/options/options.go | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/v2/internal/frontend/desktop/windows/frontend.go b/v2/internal/frontend/desktop/windows/frontend.go index 9acd4d07..5f7597da 100644 --- a/v2/internal/frontend/desktop/windows/frontend.go +++ b/v2/internal/frontend/desktop/windows/frontend.go @@ -342,17 +342,15 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger. result.servingFromDisk = true } - if appoptions.Assets != nil { - bindingsJSON, err := appBindings.ToJSON() - if err != nil { - log.Fatal(err) - } - assets, err := assetserver.NewDesktopAssetServer(ctx, *appoptions.Assets, bindingsJSON) - if err != nil { - log.Fatal(err) - } - result.assets = assets + bindingsJSON, err := appBindings.ToJSON() + if err != nil { + log.Fatal(err) } + assets, err := assetserver.NewDesktopAssetServer(ctx, appoptions.Assets, bindingsJSON) + if err != nil { + log.Fatal(err) + } + result.assets = assets return result } diff --git a/v2/pkg/options/options.go b/v2/pkg/options/options.go index a7cec7c8..497fa6cc 100644 --- a/v2/pkg/options/options.go +++ b/v2/pkg/options/options.go @@ -27,7 +27,7 @@ type App struct { StartHidden bool HideWindowOnClose bool RGBA int - Assets *embed.FS + Assets embed.FS Menu *menu.Menu Logger logger.Logger `json:"-"` LogLevel logger.LogLevel