From aadb3bb1cb8b96a0c69655abd87120ba308b9702 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Thu, 21 Sep 2017 20:13:35 -0400
Subject: [PATCH] Use browser process for closing tabs for tab page close

Fix #11028

Auditors: NejcZdovc
---
 app/renderer/reducers/contextMenuReducer.js | 4 +++-
 app/renderer/reducers/frameReducer.js       | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/renderer/reducers/contextMenuReducer.js b/app/renderer/reducers/contextMenuReducer.js
index fd0db84763a..1896c5629e6 100644
--- a/app/renderer/reducers/contextMenuReducer.js
+++ b/app/renderer/reducers/contextMenuReducer.js
@@ -95,7 +95,9 @@ const onTabPageMenu = function (state, action) {
   }, {
     label: locale.translation('closeTabPage'),
     click: () => {
-      windowActions.closeFrames(tabPageFrames)
+      tabPageFrames
+        .map((frame) => frame.get('tabId'))
+        .forEach((tabId) => appActions.tabCloseRequested(tabId))
     }
   }]
 
diff --git a/app/renderer/reducers/frameReducer.js b/app/renderer/reducers/frameReducer.js
index 4569007c7a3..e9fd744f17a 100644
--- a/app/renderer/reducers/frameReducer.js
+++ b/app/renderer/reducers/frameReducer.js
@@ -239,6 +239,8 @@ const frameReducer = (state, action, immutableAction) => {
 
     case windowConstants.WINDOW_CLOSE_FRAME:
       state = closeFrame(state, action)
+      const activeFrame = frameStateUtil.getActiveFrame(state)
+      state = frameStateUtil.updateTabPageIndex(state, activeFrame.get('tabId'))
       break
 
     case windowConstants.WINDOW_SET_FULL_SCREEN: