Merge pull request #10 from hyness/npe

Fixed NPE
ncjones · Aug 4, 2015 · a9816e8 · a9816e8
2 parents af40bdf + 34ad268
commit a9816e8
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...n/src/main/java/com/ncjones/editorconfig/eclipse/EditorConfigEditorActivationHandler.java b/...n/src/main/java/com/ncjones/editorconfig/eclipse/EditorConfigEditorActivationHandler.java
@@ -38,10 +38,12 @@ public EditorConfigEditorActivationHandler(final EditorConfigService editorConfi
 
 	@Override
 	public void editorActivated(final IFile editorFile) {
-		final EditorFileConfig fileEditorConfig = getEditorFileConfig(editorFile);
-		System.out.println("Editor activated: " + fileEditorConfig);
-		for (final ConfigProperty<?> configProperty : fileEditorConfig.getConfigProperties()) {
-			configProperty.accept(this);
+		if (editorFile != null) {
+			final EditorFileConfig fileEditorConfig = getEditorFileConfig(editorFile);
+			System.out.println("Editor activated: " + fileEditorConfig);
+			for (final ConfigProperty<?> configProperty : fileEditorConfig.getConfigProperties()) {
+				configProperty.accept(this);
+			}
 		}
 	}