From aee2af6c9f4540d6f840b84e88c022e1afe6390c Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 26 Mar 2018 17:54:21 +0200 Subject: [PATCH] composite bar: fix order when removing composite --- src/vs/workbench/browser/parts/compositebar/compositeBar.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts index 61bb1e3607f..55712a8d842 100644 --- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts +++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts @@ -99,9 +99,10 @@ export class CompositeBar implements ICompositeBar { } this.options.composites = this.options.composites.filter(c => c.id !== id); - this.deactivateComposite(id); this.unpin(id); this.pullComposite(id); + // Only at the end deactivate composite so the unpin and pull properly finish + this.deactivateComposite(id); } public activateComposite(id: string): void { -- GitLab