From 4049f8859c8b731f6024665705ef4debc955ea0e Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Mon, 23 Dec 2019 14:02:42 +0100 Subject: [PATCH] Fix context menu to rerun pp --- client/src/main/java/ctbrec/ui/RecordingsTab.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/RecordingsTab.java b/client/src/main/java/ctbrec/ui/RecordingsTab.java index e18fbf5e..0f0ed90f 100644 --- a/client/src/main/java/ctbrec/ui/RecordingsTab.java +++ b/client/src/main/java/ctbrec/ui/RecordingsTab.java @@ -240,11 +240,12 @@ public class RecordingsTab extends Tab implements TabSelectionListener { private void onKeyPressed( KeyEvent event ) { List recordings = table.getSelectionModel().getSelectedItems(); if (recordings != null && !recordings.isEmpty()) { + State status = recordings.get(0).getStatus(); if (event.getCode() == KeyCode.DELETE) { - if(recordings.size() > 1 || recordings.get(0).getStatus() == State.FINISHED) { + if(recordings.size() > 1 || status == FINISHED || status == FAILED) { delete(recordings); } - } else if (event.getCode() == KeyCode.ENTER && recordings.get(0).getStatus() == State.FINISHED) { + } else if (event.getCode() == KeyCode.ENTER && status == FINISHED) { play(recordings.get(0)); } } @@ -415,9 +416,10 @@ public class RecordingsTab extends Tab implements TabSelectionListener { MenuItem rerunPostProcessing = new MenuItem("Rerun Post-Processing"); rerunPostProcessing.setOnAction(e -> triggerPostProcessing(first)); - if (((first.getStatus() == State.FINISHED || first.getStatus() == State.WAITING) && first.isSegmented()) - || first.getStatus() == State.WAITING && first.isSegmented()) { - contextMenu.getItems().add(rerunPostProcessing); + if (first.getStatus() == FAILED || first.getStatus() == WAITING || first.getStatus() == FINISHED) { + if (first.isSegmented() || !first.isSegmented() && first.getPath().endsWith(".part")) { + contextMenu.getItems().add(rerunPostProcessing); + } } if(recordings.size() > 1) {