From 1bed8234c92e2230cd842c09ead12f2d7b327f69 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Thu, 11 Nov 2021 06:05:50 +1100
Subject: [PATCH] [v2] Fix OnShutdown for production build

---
 v2/internal/appng/app_production.go             | 3 +++
 v2/internal/frontend/desktop/darwin/frontend.go | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2/internal/appng/app_production.go b/v2/internal/appng/app_production.go
index cdc14518..704b2bd9 100644
--- a/v2/internal/appng/app_production.go
+++ b/v2/internal/appng/app_production.go
@@ -35,6 +35,9 @@ type App struct {
 
 func (a *App) Run() error {
 	err := a.frontend.Run(a.ctx)
+	if a.shutdownCallback != nil {
+		a.shutdownCallback(a.ctx)
+	}
 	return err
 }
 
diff --git a/v2/internal/frontend/desktop/darwin/frontend.go b/v2/internal/frontend/desktop/darwin/frontend.go
index 265a7aef..141d661c 100644
--- a/v2/internal/frontend/desktop/darwin/frontend.go
+++ b/v2/internal/frontend/desktop/darwin/frontend.go
@@ -214,9 +214,6 @@ func (f *Frontend) WindowSetRGBA(col *options.RGBA) {
 
 func (f *Frontend) Quit() {
 	f.mainWindow.Quit()
-	if f.frontendOptions.OnShutdown != nil {
-		f.frontendOptions.OnShutdown(f.ctx)
-	}
 }
 
 type EventNotify struct {