From a3dbab332e7741d5d78b82c8944e41cf7f573cb3 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Thu, 22 Oct 2015 15:57:34 -0700
Subject: [PATCH] fix(win): When windows are removed, keep ivars in sync

---
 src/browser/window-manager.coffee | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/browser/window-manager.coffee b/src/browser/window-manager.coffee
index 1ee56c7eb..5f865a51c 100644
--- a/src/browser/window-manager.coffee
+++ b/src/browser/window-manager.coffee
@@ -422,6 +422,10 @@ class WindowManager
   # Public: Removes the {AtomWindow} from the global window list.
   removeWindow: (window) ->
     @_windows.splice @_windows.indexOf(window), 1
+    if window is @_mainWindow
+      @_mainWindow = null
+    if window is @_workWindow
+      @_workWindow = null
     @applicationMenu?.enableWindowSpecificItems(false) if @_windows.length == 0
     @windowClosedOrHidden()