From a6c82507db31fd5794031d94e12aeb67684fd5e6 Mon Sep 17 00:00:00 2001 From: srosse <stephane.rosse@frentix.com> Date: Tue, 24 Mar 2020 08:03:34 +0100 Subject: [PATCH] OO-4590: don't dispose meeting panel if not present --- .../adobeconnect/ui/AdobeConnectRunController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/olat/modules/adobeconnect/ui/AdobeConnectRunController.java b/src/main/java/org/olat/modules/adobeconnect/ui/AdobeConnectRunController.java index 302f6feb3bb..5c8c83a6d19 100644 --- a/src/main/java/org/olat/modules/adobeconnect/ui/AdobeConnectRunController.java +++ b/src/main/java/org/olat/modules/adobeconnect/ui/AdobeConnectRunController.java @@ -181,9 +181,11 @@ public class AdobeConnectRunController extends BasicController implements Activa } private void back() { - mainVC.remove(meetingCtrl.getInitialComponent()); - removeAsListenerAndDispose(meetingCtrl); - meetingCtrl = null; + if(meetingCtrl != null) { + mainVC.remove(meetingCtrl.getInitialComponent()); + removeAsListenerAndDispose(meetingCtrl); + meetingCtrl = null; + } } private void doOpenMeetings(UserRequest ureq) { -- GitLab