Skip to content
Snippets Groups Projects
Commit 919f21a4 authored by srosse's avatar srosse
Browse files

OO-3745: fix with several sequential delete, set 00:00:00 def. time

parent a34655cf
No related branches found
No related tags found
No related merge requests found
...@@ -312,6 +312,8 @@ public class VideoMarkerEditController extends BasicController { ...@@ -312,6 +312,8 @@ public class VideoMarkerEditController extends BasicController {
if(currentTimeCode != null) { if(currentTimeCode != null) {
long time = Math.round(Double.parseDouble(currentTimeCode)) * 1000l; long time = Math.round(Double.parseDouble(currentTimeCode)) * 1000l;
newMarker.setBegin(new Date(time)); newMarker.setBegin(new Date(time));
} else {
newMarker.setBegin(new Date(0l));
} }
markers.getMarkers().add(newMarker); markers.getMarkers().add(newMarker);
...@@ -341,7 +343,7 @@ public class VideoMarkerEditController extends BasicController { ...@@ -341,7 +343,7 @@ public class VideoMarkerEditController extends BasicController {
private void doDeleteMarker(VideoMarker marker) { private void doDeleteMarker(VideoMarker marker) {
markers.getMarkers().remove(marker); markers.getMarkers().remove(marker);
videoManager.saveMarkers(markers, entry.getOlatResource()); 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); markerEditCtrl.getInitialComponent().setVisible(false);
} }
loadModel(true, markers.getMarkers()); loadModel(true, markers.getMarkers());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment