From 46291d9300c9cbd69cc31f7cb6ff48dc6a39f24e Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Tue, 5 Nov 2019 20:44:02 +0100
Subject: [PATCH] OO-4254: fix double check of modal dialog in single page
editor
---
.../filechooser/LinkFileCombiCalloutController.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java b/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java
index e3e29a20a8a..e31e599d5f3 100644
--- a/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java
+++ b/src/main/java/org/olat/core/commons/controllers/filechooser/LinkFileCombiCalloutController.java
@@ -383,7 +383,8 @@ public class LinkFileCombiCalloutController extends BasicController {
* @param newModalContentController
*/
private void displayModal(Controller newModalContentController) {
- if (guardModalController(newModalContentController)) return;
+ if (newModalContentController == null) return;
+
currentModalController = newModalContentController;
listenTo(currentModalController);
cmc = new CloseableModalController(getWindowControl(), "close", newModalContentController.getInitialComponent());
--
GitLab