diff --git a/client/src/main/java/ctbrec/ui/menu/ModelMenuContributor.java b/client/src/main/java/ctbrec/ui/menu/ModelMenuContributor.java index 1491a44d..73bb762c 100644 --- a/client/src/main/java/ctbrec/ui/menu/ModelMenuContributor.java +++ b/client/src/main/java/ctbrec/ui/menu/ModelMenuContributor.java @@ -274,7 +274,7 @@ public class ModelMenuContributor { } private void addForceRecord(ContextMenu menu, List selectedModels) { - var forcePriority = new MenuItem("Force Recording"); + var forcePriority = new MenuItem("Enable Force Recording"); forcePriority.setOnAction(e -> { for (Model model : selectedModels) { model.setMarkedForLaterRecording(false); @@ -285,7 +285,7 @@ public class ModelMenuContributor { } new ForcePriorityHandler(source, recorder, callback).forcePriority(selectedModels); }); - var resumePriority = new MenuItem("Resume Priority"); + var resumePriority = new MenuItem("Disable Force Recording"); resumePriority.setOnAction(e -> new ForcePriorityHandler(source, recorder, callback).resumePriority(selectedModels)); var forceResumePriority = recorder.isForcePriority(selectedModels.get(0)) ? resumePriority : forcePriority; menu.getItems().add(forceResumePriority); diff --git a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java index ed53dbb3..966bc280 100644 --- a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java +++ b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java @@ -306,8 +306,8 @@ public class SettingsTab extends Tab implements TabSelectionListener { Group.of("Ignore List", Setting.of("", ignoreList)), Group.of("Text Filters", - Setting.of("Default Blacklist", filterBlacklist, "Default list of blacklist filters for site views, space seperated"), - Setting.of("Default Whitelist", filterWhitelist, "Default list of whitelist filters for site views, space seperated"))), Category.of("Sites", siteCategories.toArray(new Category[0])), + Setting.of("Blacklist", filterBlacklist, "Default list of blacklist filters for site views, space seperated"), + Setting.of("Whitelist", filterWhitelist, "Default list of whitelist filters for site views, space seperated"))), Category.of("Sites", siteCategories.toArray(new Category[0])), Category.of("Proxy", Group.of("Proxy", Setting.of("Type", proxyType).needsRestart(), diff --git a/common/src/main/java/ctbrec/recorder/RecordingPreconditions.java b/common/src/main/java/ctbrec/recorder/RecordingPreconditions.java index e187238a..a681ade3 100644 --- a/common/src/main/java/ctbrec/recorder/RecordingPreconditions.java +++ b/common/src/main/java/ctbrec/recorder/RecordingPreconditions.java @@ -115,7 +115,7 @@ public class RecordingPreconditions { int lowestPrio = Integer.MAX_VALUE; for (Recording rec : recorder.getRecordingProcesses()) { Model m = rec.getModel(); - if (m.getPriority() < lowestPrio) { + if (m.getPriority() < lowestPrio && !m.isForcePriority()) { lowest = rec; lowestPrio = m.getPriority(); }