From c948507bccabe6fa5ffc0d9b74b0dfb3770dae08 Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Sat, 17 Apr 2021 11:30:19 +0200 Subject: [PATCH] Fix bug, which causes the deletion of the ignored models list --- CHANGELOG.md | 5 +++++ common/src/main/java/ctbrec/Config.java | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fce35208..220c67b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +4.1.3 +======================== +* Fixed Stripchat pagination bug +* Fix bug, which causes the deletion of the ignored models list + 4.1.2 ======================== * Fixed bug, which caused some recordings to get stuck diff --git a/common/src/main/java/ctbrec/Config.java b/common/src/main/java/ctbrec/Config.java index 58b1f625..f85da4f7 100644 --- a/common/src/main/java/ctbrec/Config.java +++ b/common/src/main/java/ctbrec/Config.java @@ -177,16 +177,18 @@ public class Config { } // 3.11.0 make Cam4 model names lower case settings.models.stream() - .filter(m -> m instanceof Cam4Model) + .filter(Cam4Model.class::isInstance) .forEach(m -> m.setName(m.getName().toLowerCase())); settings.modelsIgnored.stream() - .filter(m -> m instanceof Cam4Model) + .filter(Cam4Model.class::isInstance) .forEach(m -> m.setName(m.getName().toLowerCase())); // 4.1.2 reduce models ignore to store only the URL - settings.ignoredModels = settings.modelsIgnored.stream() - .map(Model::getUrl) - .collect(Collectors.toList()); - settings.modelsIgnored = null; + if (settings.modelsIgnored != null && !settings.modelsIgnored.isEmpty()) { + settings.ignoredModels = settings.modelsIgnored.stream() + .map(Model::getUrl) + .collect(Collectors.toList()); + settings.modelsIgnored = null; + } } private void makeBackup(File source) {