Merge Branch Freeze into Develop

sebHollersbacher · Jan 8, 2025 · 472eba0 · 472eba0
2 parents eb55f32 + 76b50e0
commit 472eba0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...pse.fordiac.ide.gef/src/org/eclipse/fordiac/ide/gef/annotation/FordiacAnnotationUtil.java b/...pse.fordiac.ide.gef/src/org/eclipse/fordiac/ide/gef/annotation/FordiacAnnotationUtil.java
@@ -69,7 +69,8 @@ public static EStructuralFeature getTargetFeature(final GraphicalAnnotation anno
 	}
 
 	public static GraphicalAnnotationModel getAnnotationModel(final EditPart editPart) {
-		if (editPart.getViewer().getEditPartFactory() instanceof final Abstract4diacEditPartFactory factory) {
+		if (editPart.getViewer().getEditPartFactory() instanceof final Abstract4diacEditPartFactory factory
+				&& factory.getEditor() != null) {
 			return factory.getEditor().getAdapter(GraphicalAnnotationModel.class);
 		}
 		return null;