From 84410a7e1c1a053220333e374b1445bd9d2259ff Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 4 Nov 2015 17:23:27 +0800
Subject: [PATCH] mac: Destroy the app delegate before running destruction
 callbacks

Otherwise users might be able to access wrapper functions after they are
destroyed.
---
 atom/browser/atom_browser_main_parts.cc     | 4 ++++
 atom/browser/atom_browser_main_parts.h      | 5 ++++-
 atom/browser/atom_browser_main_parts_mac.mm | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc
index 5fae5bfdbedd..f6d1070e875d 100644
--- a/atom/browser/atom_browser_main_parts.cc
+++ b/atom/browser/atom_browser_main_parts.cc
@@ -128,6 +128,10 @@ void AtomBrowserMainParts::PostMainMessageLoopStart() {
 void AtomBrowserMainParts::PostMainMessageLoopRun() {
   brightray::BrowserMainParts::PostMainMessageLoopRun();
 
+#if defined(OS_MACOSX)
+  FreeAppDelegate();
+#endif
+
   // Make sure destruction callbacks are called before message loop is
   // destroyed, otherwise some objects that need to be deleted on IO thread
   // won't be freed.
diff --git a/atom/browser/atom_browser_main_parts.h b/atom/browser/atom_browser_main_parts.h
index 65b142157dc1..360b1cba1169 100644
--- a/atom/browser/atom_browser_main_parts.h
+++ b/atom/browser/atom_browser_main_parts.h
@@ -46,7 +46,6 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
   void PostMainMessageLoopRun() override;
 #if defined(OS_MACOSX)
   void PreMainMessageLoopStart() override;
-  void PostDestroyThreads() override;
 #endif
 
  private:
@@ -56,6 +55,10 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
   void HandleShutdownSignals();
 #endif
 
+#if defined(OS_MACOSX)
+  void FreeAppDelegate();
+#endif
+
   // A fake BrowserProcess object that used to feed the source code from chrome.
   scoped_ptr<BrowserProcess> fake_browser_process_;
 
diff --git a/atom/browser/atom_browser_main_parts_mac.mm b/atom/browser/atom_browser_main_parts_mac.mm
index 1de07dfc0e44..42e3100f490e 100644
--- a/atom/browser/atom_browser_main_parts_mac.mm
+++ b/atom/browser/atom_browser_main_parts_mac.mm
@@ -34,7 +34,7 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() {
       setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
 }
 
-void AtomBrowserMainParts::PostDestroyThreads() {
+void AtomBrowserMainParts::FreeAppDelegate() {
   [[NSApp delegate] release];
   [NSApp setDelegate:nil];
 }