From 1900ad4cb9ecbd88d065d26436e42e4d8dbaf6c8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 7 May 2013 16:20:52 +0800
Subject: [PATCH] Make sure the 'closed' event is emitted before
 'window-all-closed'.

---
 browser/default_app/main.js | 5 +++++
 browser/native_window.cc    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/browser/default_app/main.js b/browser/default_app/main.js
index e8daddefc1..50807df33c 100644
--- a/browser/default_app/main.js
+++ b/browser/default_app/main.js
@@ -28,4 +28,9 @@ atom.browserMainParts.preMainMessageLoopRun = function() {
 
     this.setTitle('Atom Shell - ' + title);
   });
+
+  mainWindow.on('closed', function() {
+    console.log('closed');
+    mainWindow = null;
+  });
 }
diff --git a/browser/native_window.cc b/browser/native_window.cc
index cbea4a75fb..179a6aad3c 100644
--- a/browser/native_window.cc
+++ b/browser/native_window.cc
@@ -157,9 +157,9 @@ void NativeWindow::NotifyWindowClosed() {
     return;
 
   is_closed_ = true;
-  WindowList::RemoveWindow(this);
-
   FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowClosed());
+
+  WindowList::RemoveWindow(this);
 }
 
 // Window opened by window.open.