From 3213a16774d4a38c75cafc7bc011502b07b91646 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Thu, 2 Sep 2021 14:07:29 -0400
Subject: [PATCH] [MM-36309] Completely remove menu bar from Linux/Windows
 (#1718)

---
 src/main/main.ts                  | 1 +
 src/main/windows/windowManager.ts | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/main/main.ts b/src/main/main.ts
index 857f2c7f..c171ad4f 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -845,6 +845,7 @@ function handleCloseAppMenu() {
 function handleUpdateMenuEvent(event: IpcMainEvent, menuConfig: Config) {
     const aMenu = appMenu.createMenu(menuConfig);
     Menu.setApplicationMenu(aMenu);
+    WindowManager.removeWindowMenu();
     aMenu.addListener('menu-will-close', handleCloseAppMenu);
 
     // set up context menu for tray icon
diff --git a/src/main/windows/windowManager.ts b/src/main/windows/windowManager.ts
index 5d1fdb1d..c7d3575e 100644
--- a/src/main/windows/windowManager.ts
+++ b/src/main/windows/windowManager.ts
@@ -548,3 +548,7 @@ function handleBrowserHistoryPush(e: IpcMainEvent, viewName: string, pathName: s
 export function getCurrentTeamName() {
     return status.currentServerName;
 }
+
+export function removeWindowMenu() {
+    status.mainWindow?.removeMenu();
+}