From 7bafa3e79d47e9c5e2db6bedc43b401116c3d303 Mon Sep 17 00:00:00 2001
From: donald.g.dunne
Date: Tue, 29 Aug 2017 17:02:33 -0700
Subject: bug[ats_TW1856]: XWorkingBranchLabel showing SENTINEL when no branch

Change-Id: Ie90d11ee0f71c9aa1567a5224d1b205a24452a30
---
 .../src/org/eclipse/osee/ats/util/widgets/XWorkingBranchLabel.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranchLabel.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranchLabel.java
index 95768fe0f2b..7afafd83907 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranchLabel.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XWorkingBranchLabel.java
@@ -64,7 +64,7 @@ public class XWorkingBranchLabel extends XWorkingBranchWidgetAbstract {
                   if (labelWidget != null && Widgets.isAccessible(labelWidget) && !getLabel().equals("")) {
                      IOseeBranch workBranch = getWorkingBranch();
                      String labelStr =
-                        getLabel() + ": " + getStatus().getDisplayName() + (workBranch != null ? " - " + workBranch.getShortName() : "");
+                        getLabel() + ": " + getStatus().getDisplayName() + (workBranch != null && workBranch.isValid() ? " - " + workBranch.getShortName() : "");
                      labelWidget.setText(labelStr);
                      if (getToolTip() != null) {
                         labelWidget.setToolTipText(getToolTip());
-- 
cgit v1.2.3