From 07b7e993da6b65f0bc361bd27a95dd3f0179a4c7 Mon Sep 17 00:00:00 2001
From: SteVen Batten <steven.m.batten@outlook.com>
Date: Mon, 10 Aug 2020 12:43:42 -0700
Subject: [PATCH] fixes #104224

---
 src/vs/base/browser/ui/menu/menu.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
index 028c8c157be..a150e286875 100644
--- a/src/vs/base/browser/ui/menu/menu.ts
+++ b/src/vs/base/browser/ui/menu/menu.ts
@@ -791,7 +791,12 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
 
 	private cleanupExistingSubmenu(force: boolean): void {
 		if (this.parentData.submenu && (force || (this.parentData.submenu !== this.mysubmenu))) {
-			this.parentData.submenu.dispose();
+
+			// disposal may throw if the submenu has already been removed
+			try {
+				this.parentData.submenu.dispose();
+			} catch { }
+
 			this.parentData.submenu = undefined;
 			this.updateAriaExpanded('false');
 			if (this.submenuContainer) {
-- 
GitLab