Skip to content

Commit 119c5f7

Browse files
committed
[28403] check viewer before access
1 parent 0d42a9c commit 119c5f7

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

bundles/ch.elexis.core.ui/src/ch/elexis/core/ui/views/codesystems/CodeElementStatisticsComposite.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public String getText(Object element) {
6464
MenuManager menu = new MenuManager();
6565
menu.setRemoveAllWhenShown(true);
6666
menu.addMenuListener(new IMenuListener() {
67+
@Override
6768
public void menuAboutToShow(IMenuManager manager) {
6869
manager.add(new ClearStatisticAction());
6970
}
@@ -93,10 +94,12 @@ public void setTitle(String title) {
9394

9495
public void setContact(IContact contact) {
9596
this.contact = contact;
96-
if (contact != null) {
97-
viewer.setInput(CodeElementServiceHolder.getStatistics(elexisClassName, contact));
98-
} else {
99-
viewer.setInput(Collections.emptyList());
97+
if (viewer != null && viewer.getControl() != null && !viewer.getControl().isDisposed()) {
98+
if (contact != null) {
99+
viewer.setInput(CodeElementServiceHolder.getStatistics(elexisClassName, contact));
100+
} else {
101+
viewer.setInput(Collections.emptyList());
102+
}
100103
}
101104
}
102105

0 commit comments

Comments
 (0)