Merge branch 'dev' into cam4

CHANGELOG.md

@@ -1,3 +1,7 @@
+1.6.1
+========================
+* Fixed UI freeze, which occured for a high number of recorded models
+
 1.6.0
 ========================
 * Added support for multiple cam sites

src/main/java/ctbrec/recorder/LocalRecorder.java

@@ -166,7 +166,12 @@ public class LocalRecorder implements Recorder {
 
     @Override
     public List<Model> getModelsRecording() {
+        lock.lock();
+        try {
             return Collections.unmodifiableList(new ArrayList<>(models));
+        } finally {
+            lock.unlock();
+        }
     }
 
     @Override
@@ -308,8 +313,6 @@ public class LocalRecorder implements Recorder {
         public void run() {
             running = true;
             while (running) {
-                lock.lock();
-                try {
                 for (Model model : getModelsRecording()) {
                     try {
                         if (!recordingProcesses.containsKey(model)) {
@@ -324,9 +327,6 @@ public class LocalRecorder implements Recorder {
                         LOG.error("Couldn't check if model {} is online", model.getName(), e);
                     }
                 }
-                } finally {
-                    lock.unlock();
-                }
 
                 try {
                     if (running)