From 71631bf2cd40ff6ef53829eb658b7abc99c62a8a Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 12 Jun 2018 12:41:05 +0200
Subject: [PATCH] Fix #51396

---
 .../parts/compositebar/compositeBarActions.ts  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
index 001dd3a6842..2da7b86088f 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
@@ -127,7 +127,7 @@ export class ActivityActionItem extends BaseActionItem {
 		super(null, action, options);
 
 		this.themeService.onThemeChange(this.onThemeChange, this, this._callOnDispose);
-		action.onDidChangeBadge(this.handleBadgeChangeEvenet, this, this._callOnDispose);
+		action.onDidChangeBadge(this.updateBadge, this, this._callOnDispose);
 	}
 
 	protected get activity(): IActivity {
@@ -200,17 +200,22 @@ export class ActivityActionItem extends BaseActionItem {
 		this.$badge.hide();
 
 		this.updateStyles();
+		this.updateBadge();
 	}
 
 	private onThemeChange(theme: ITheme): void {
 		this.updateStyles();
 	}
 
-	protected updateBadge(badge: IBadge, clazz?: string): void {
-		if (!this.$badge || !this.$badgeContent) {
+	protected updateBadge(): void {
+		const action = this.getAction();
+		if (!this.$badge || !this.$badgeContent || !(action instanceof ActivityAction)) {
 			return;
 		}
 
+		const badge = action.getBadge();
+		const clazz = action.getClass();
+
 		this.badgeDisposable.dispose();
 		this.badgeDisposable = empty;
 
@@ -275,13 +280,6 @@ export class ActivityActionItem extends BaseActionItem {
 		});
 	}
 
-	private handleBadgeChangeEvenet(): void {
-		const action = this.getAction();
-		if (action instanceof ActivityAction) {
-			this.updateBadge(action.getBadge(), action.getClass());
-		}
-	}
-
 	public dispose(): void {
 		super.dispose();
 
-- 
GitLab