RUN-3177 fixed errors on closing because of event timing. (#127)

HadoukenIO · Aug 2, 2017 · 1f943ef · 1f943ef
1 parent 718e8c6
commit 1f943ef
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/browser/api/window.js b/src/browser/api/window.js
@@ -1554,6 +1554,9 @@ Window.onUnload = (identity) => {
 function emitCloseEvents(identity) {
     const { uuid, name } = identity;
 
+    ofEvents.emit(route.window('unload', uuid, name, false), identity);
+    ofEvents.emit(route.window('openfin-diagnostic/unload', uuid, name, true), identity);
+
     electronApp.emit('browser-window-closed', null, getElectronBrowserWindow(identity));
 
     ofEvents.emit(route.window('closed'), {
@@ -1584,8 +1587,6 @@ function emitCloseEvents(identity) {
         name
     });
 
-    ofEvents.emit(route.window('unload', uuid, name, false), identity);
-    ofEvents.emit(route.window('openfin-diagnostic/unload', uuid, name, true), identity);
     ofEvents.emit(route.window('init-subscription-listeners'), identity);
 }