From 2f554e8460e9df6168041f8e8d2328e7453dd21c Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 2 Sep 2014 16:15:30 +0200
Subject: [PATCH] OO-990: fix check of concurrent edit

---
 .../java/org/olat/course/run/CourseRuntimeController.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/olat/course/run/CourseRuntimeController.java b/src/main/java/org/olat/course/run/CourseRuntimeController.java
index 384dc0ac09f..fa2da871817 100644
--- a/src/main/java/org/olat/course/run/CourseRuntimeController.java
+++ b/src/main/java/org/olat/course/run/CourseRuntimeController.java
@@ -805,9 +805,9 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
 			ICourse course = CourseFactory.loadCourse(getRepositoryEntry().getOlatResource());
 			CourseNode currentCourseNode = getCurrentCourseNode();
 			EditorMainController ctrl = CourseFactory.createEditorController(ureq, getWindowControl(), course, currentCourseNode);
-			editorCtrl = pushController(ureq, "Editor", ctrl);
 			//user activity logger which was initialized with course run
-			if(editorCtrl != null){
+			if(ctrl != null){
+				editorCtrl = pushController(ureq, "Editor", ctrl);
 				listenTo(editorCtrl);
 				setIsInEditor(true);
 				currentToolCtr = editorCtrl;
-- 
GitLab