From 4e04e7bcea6d9ba89f2fcef75290ea3ffea36b94 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 18 Jan 2021 07:20:14 +0100
Subject: [PATCH] OO-5231: don't dispatch event from disposed controller

---
 .../core/commons/editor/fileeditor/FileEditorController.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/olat/core/commons/editor/fileeditor/FileEditorController.java b/src/main/java/org/olat/core/commons/editor/fileeditor/FileEditorController.java
index d825d3aac85..5fd282e9d44 100644
--- a/src/main/java/org/olat/core/commons/editor/fileeditor/FileEditorController.java
+++ b/src/main/java/org/olat/core/commons/editor/fileeditor/FileEditorController.java
@@ -142,7 +142,9 @@ public class FileEditorController extends BasicController implements Activateabl
 	@Override
 	public void event(UserRequest ureq, Component source, Event event) {
 		if(event == Window.CLOSE_WINDOW) {
-			editCtrl.dispatchEvent(ureq, source, event);
+			if(editCtrl != null) {
+				editCtrl.dispatchEvent(ureq, source, event);
+			}
 			doUnlock();
 		}
 	}
-- 
GitLab