From 919f21a40bbb157c0cebf8f94c4399002cc51c02 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 25 Jan 2019 15:50:26 +0100
Subject: [PATCH] OO-3745: fix with several sequential delete, set 00:00:00
def. time
---
.../modules/video/ui/marker/VideoMarkerEditController.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/modules/video/ui/marker/VideoMarkerEditController.java b/src/main/java/org/olat/modules/video/ui/marker/VideoMarkerEditController.java
index 3aee7827be5..e1d4259dc62 100644
--- a/src/main/java/org/olat/modules/video/ui/marker/VideoMarkerEditController.java
+++ b/src/main/java/org/olat/modules/video/ui/marker/VideoMarkerEditController.java
@@ -312,6 +312,8 @@ public class VideoMarkerEditController extends BasicController {
if(currentTimeCode != null) {
long time = Math.round(Double.parseDouble(currentTimeCode)) * 1000l;
newMarker.setBegin(new Date(time));
+ } else {
+ newMarker.setBegin(new Date(0l));
}
markers.getMarkers().add(newMarker);
@@ -341,7 +343,7 @@ public class VideoMarkerEditController extends BasicController {
private void doDeleteMarker(VideoMarker marker) {
markers.getMarkers().remove(marker);
videoManager.saveMarkers(markers, entry.getOlatResource());
- if(markerEditCtrl != null && markerEditCtrl.getMarker().equals(marker)) {
+ if(markerEditCtrl != null && markerEditCtrl.getMarker() != null && markerEditCtrl.getMarker().equals(marker)) {
markerEditCtrl.getInitialComponent().setVisible(false);
}
loadModel(true, markers.getMarkers());
--
GitLab