[17382] fixed deselection of block if selection is null

486a7eb9 · Thomas Huster · 384e960c · 486a7eb9
Commit 486a7eb9 authored Dec 10, 2019 by Thomas Huster
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

bundles/ch.elexis.core.ui/src/ch/elexis/core/ui/views/codesystems/BlockSelector.java ...rc/ch/elexis/core/ui/views/codesystems/BlockSelector.java +5 -1

No files found.
--- a/bundles/ch.elexis.core.ui/src/ch/elexis/core/ui/views/codesystems/BlockSelector.java
+++ b/bundles/ch.elexis.core.ui/src/ch/elexis/core/ui/views/codesystems/BlockSelector.java
@@ -101,7 +101,11 @@ public class BlockSelector extends CodeSelectorFactory {
 				selected = ((BlockTreeViewerItem) firstElement).getBlock();
 			}
 			tvfa.updateSelection((Identifiable) selected);
-			ContextServiceHolder.get().getRootContext().setTyped(selected);
+			if (selected != null) {
+				ContextServiceHolder.get().getRootContext().setTyped(selected);
+			} else {
+				ContextServiceHolder.get().getRootContext().removeTyped(ICodeElementBlock.class);
+			}
 		}
 	};