From 6f60ee664c175442f3926b4d5141d64fde264e30 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 9 Dec 2020 13:59:12 +0100
Subject: [PATCH] OO-5133: make the close button work above a TinyMCE modal
 dialog

---
 .../generic/closablewrapper/CloseableModalController.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/olat/core/gui/control/generic/closablewrapper/CloseableModalController.java b/src/main/java/org/olat/core/gui/control/generic/closablewrapper/CloseableModalController.java
index 5a62a495db1..68f51a574eb 100644
--- a/src/main/java/org/olat/core/gui/control/generic/closablewrapper/CloseableModalController.java
+++ b/src/main/java/org/olat/core/gui/control/generic/closablewrapper/CloseableModalController.java
@@ -191,7 +191,7 @@ public class CloseableModalController extends DefaultController implements Modal
 	@Override
 	public void event(UserRequest ureq, Component source, Event event) {
 		if (source == closeIcon){
-			getWindowControl().pop();
+			deactivate();
 			fireEvent(ureq, CLOSE_MODAL_EVENT);
 		}
 	}
-- 
GitLab