From 1382f8fa1efff08059d182e27f25cae5dfb3a7a7 Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Fri, 13 Aug 2021 18:54:30 +0200
Subject: [PATCH] Fix record until clock not showing up in recorded models tab
 in client / erver mode

---
 .../src/main/java/ctbrec/ui/action/SetStopDateAction.java   | 6 ------
 .../java/ctbrec/ui/tabs/recorded/RecordedModelsTab.java     | 2 ++
 .../src/main/java/ctbrec/recorder/NextGenLocalRecorder.java | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/src/main/java/ctbrec/ui/action/SetStopDateAction.java b/client/src/main/java/ctbrec/ui/action/SetStopDateAction.java
index ef85a32d..df183fad 100644
--- a/client/src/main/java/ctbrec/ui/action/SetStopDateAction.java
+++ b/client/src/main/java/ctbrec/ui/action/SetStopDateAction.java
@@ -77,12 +77,6 @@ public class SetStopDateAction {
                 model.setRecordUntil(stopAt);
                 model.setRecordUntilSubsequentAction(action);
                 try {
-                    try {
-                        Thread.sleep(1000);
-                    } catch (InterruptedException e1) {
-                        // TODO Auto-generated catch block
-                        e1.printStackTrace();
-                    }
                     recorder.stopRecordingAt(model);
                 } catch (InvalidKeyException | NoSuchAlgorithmException | IOException e) {
                     Dialogs.showError(source.getScene(), "Error", "Couln't set stop date", e);
diff --git a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsTab.java b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsTab.java
index 71d1f398..094df8c7 100644
--- a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsTab.java
+++ b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsTab.java
@@ -506,6 +506,8 @@ public class RecordedModelsTab extends Tab implements TabSelectionListener {
                 oldModel.getRecordingProperty().set(updatedModel.getRecordingProperty().get());
                 oldModel.lastRecordedProperty().set(updatedModel.lastRecordedProperty().get());
                 oldModel.lastSeenProperty().set(updatedModel.lastSeenProperty().get());
+                oldModel.setRecordUntil(updatedModel.getRecordUntil());
+                oldModel.setRecordUntilSubsequentAction(updatedModel.getRecordUntilSubsequentAction());
             }
         }
     }
diff --git a/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java b/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java
index 6cba4cf9..b363043b 100644
--- a/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java
+++ b/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java
@@ -764,6 +764,7 @@ public class NextGenLocalRecorder implements Recorder {
                 Model m = models.get(index);
                 m.setRecordUntil(model.getRecordUntil());
                 m.setRecordUntilSubsequentAction(model.getRecordUntilSubsequentAction());
+                LOG.debug("Stopping recording of model {} at {} and then {}", m, model.getRecordUntil(), m.getRecordUntilSubsequentAction());
                 config.save();
             } else {
                 throw new NoSuchElementException("Model " + model.getName() + " [" + model.getUrl() + "] not found in list of recorded models");