From 7af6d41c89e02f6a1024b5d9898f208244e488c7 Mon Sep 17 00:00:00 2001 From: srosse <none@none> Date: Fri, 7 Jun 2013 15:59:22 +0200 Subject: [PATCH] OO-531: fix events handling for cmd in the folder component --- .../core/commons/modules/bc/FolderRunController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java b/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java index ba7d4d92b5d..cb171f5f300 100644 --- a/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java +++ b/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java @@ -387,11 +387,12 @@ public class FolderRunController extends BasicController implements Activateable folderCommand = FolderCommandFactory.getInstance().getCommand(cmd, ureq, getWindowControl()); if (folderCommand != null) { - folderCommandController = folderCommand.execute(folderComponent, ureq, getWindowControl(), getTranslator()); - if (folderCommandController != null) { + Controller commandController = folderCommand.execute(folderComponent, ureq, getWindowControl(), getTranslator()); + if (commandController != null) { + folderCommandController = commandController; // activate command's controller - this.listenTo(folderCommandController); - if ( ! folderCommand.runsModal()) { + listenTo(folderCommandController); + if (!folderCommand.runsModal()) { cmc = new CloseableModalController(getWindowControl(), translate("close"), folderCommandController.getInitialComponent()); cmc.activate(); listenTo(cmc); -- GitLab