Merge pull request #590 from joaomoreno/joao/fix-586

Fix undefined access error
microsoft · Nov 6, 2019 · 50e9c03 · 50e9c03
2 parents 2908ec8 + bf54156
commit 50e9c03
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/tfvc/tfvcscmprovider.ts b/src/tfvc/tfvcscmprovider.ts
@@ -140,6 +140,10 @@ export class TfvcSCMProvider {
     }
 
     private onDidModelChange(): void {
+        if (!this.conflictsGroup) {
+            return;
+        }
+
         this.conflictsGroup.resourceStates = this._model.ConflictsGroup.resources;
         this.includedGroup.resourceStates = this._model.IncludedGroup.resources;
         this.excludedGroup.resourceStates = this._model.ExcludedGroup.resources;