don't ask to install an incomplete menu

mustafa-95 · Aug 3, 2018 · e30a864 · e30a864
1 parent dbd9ef1
commit e30a864
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/vs/workbench/browser/parts/menubar/menubarPart.ts b/src/vs/workbench/browser/parts/menubar/menubarPart.ts
@@ -424,7 +424,10 @@ export class MenubarPart extends Part {
 			this.setupCustomMenubar();
 		} else {
 			// Send menus to main process to be rendered by Electron
-			this.menubarService.updateMenubar(this.windowService.getCurrentWindowId(), this.getMenubarMenus(), this.getAdditionalKeybindings());
+			const menubarData = {};
+			if (this.getMenubarMenus(menubarData)) {
+				this.menubarService.updateMenubar(this.windowService.getCurrentWindowId(), menubarData, this.getAdditionalKeybindings());
+			}
 		}
 	}
 
@@ -901,17 +904,23 @@ export class MenubarPart extends Part {
 		return keybindings;
 	}
 
-	private getMenubarMenus(): IMenubarData {
-		let ret: IMenubarData = {};
+	private getMenubarMenus(menubarData: IMenubarData): boolean {
+		if (!menubarData) {
+			return false;
+		}
 
 		for (let topLevelMenuName of Object.keys(this.topLevelMenus)) {
 			const menu = this.topLevelMenus[topLevelMenuName];
 			let menubarMenu: IMenubarMenu = { items: [] };
 			this.populateMenuItems(menu, menubarMenu);
-			ret[topLevelMenuName] = menubarMenu;
+			if (menubarMenu.items.length === 0) {
+				// Menus are incomplete
+				return false;
+			}
+			menubarData[topLevelMenuName] = menubarMenu;
 		}
 
-		return ret;
+		return true;
 	}
 
 	private isCurrentMenu(menuIndex: number): boolean {