diff --git a/v2/internal/appng/app_dev.go b/v2/internal/appng/app_dev.go index da715a3d..98856e19 100644 --- a/v2/internal/appng/app_dev.go +++ b/v2/internal/appng/app_dev.go @@ -18,7 +18,6 @@ import ( "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/menumanager" "github.com/wailsapp/wails/v2/internal/project" - "github.com/wailsapp/wails/v2/internal/signal" pkglogger "github.com/wailsapp/wails/v2/pkg/logger" "github.com/wailsapp/wails/v2/pkg/options" ) @@ -27,7 +26,6 @@ import ( type App struct { frontend frontend.Frontend logger *logger.Logger - signal *signal.Manager options *options.App menuManager *menumanager.Manager diff --git a/v2/internal/appng/app_production.go b/v2/internal/appng/app_production.go index 7e404d35..f6d46aa7 100644 --- a/v2/internal/appng/app_production.go +++ b/v2/internal/appng/app_production.go @@ -5,6 +5,7 @@ package appng import ( "context" + "github.com/wailsapp/wails/v2/internal/binding" "github.com/wailsapp/wails/v2/internal/frontend" "github.com/wailsapp/wails/v2/internal/frontend/desktop" @@ -12,7 +13,6 @@ import ( "github.com/wailsapp/wails/v2/internal/frontend/runtime" "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/menumanager" - "github.com/wailsapp/wails/v2/internal/signal" "github.com/wailsapp/wails/v2/pkg/options" ) @@ -20,7 +20,6 @@ import ( type App struct { frontend frontend.Frontend logger *logger.Logger - signal *signal.Manager options *options.App menuManager *menumanager.Manager @@ -39,6 +38,7 @@ func (a *App) Run() error { if a.shutdownCallback != nil { a.shutdownCallback(a.ctx) } + return err } diff --git a/v2/internal/signal/signal.go b/v2/internal/signal/signal.go index 6d38d89c..f6db19cd 100644 --- a/v2/internal/signal/signal.go +++ b/v2/internal/signal/signal.go @@ -35,7 +35,7 @@ func NewManager(ctx context.Context, cancel context.CancelFunc, bus *servicebus. result := &Manager{ bus: bus, - logger: logger.CustomLogger("Event Manager"), + logger: logger.CustomLogger("Signal Manager"), signalchannel: make(chan os.Signal, 2), ctx: ctx, cancel: cancel, @@ -49,7 +49,7 @@ func NewManager(ctx context.Context, cancel context.CancelFunc, bus *servicebus. func (m *Manager) Start() { // Hook into interrupts - gosignal.Notify(m.signalchannel, os.Interrupt, syscall.SIGTERM) + gosignal.Notify(m.signalchannel, os.Interrupt, syscall.SIGTERM, syscall.SIGINT) m.wg.Add(1)