j62
/
ctbrec
2
2
Fork 2
Code Issues 9 Pull Requests Packages Projects Releases 3 Wiki Activity

Merge branch 'dev' into cam4

This commit is contained in:
0xboobface 2018-10-29 22:38:27 +01:00
parent 2ffdbfa71a 8009b3cf36
commit c8e3db4021
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

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

10
src/main/java/ctbrec/recorder/LocalRecorder.java
View File

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