ctbrecuser
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Allow recordings in state WAITING to be deleted

This commit is contained in:
0xboobface 2019-12-28 16:47:00 +01:00
parent 6fcbdab174
commit 738aca8a06
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/main/java/ctbrec/ui/RecordingsTab.java
View File

@ -191,7 +191,6 @@ public class RecordingsTab extends Tab implements TabSelectionListener {
} }
}; };
return cell; return cell;
} }
private TableCell<JavaFxRecording, Instant> createDateCell() { private TableCell<JavaFxRecording, Instant> createDateCell() {
@ -242,7 +241,7 @@ public class RecordingsTab extends Tab implements TabSelectionListener {
if (recordings != null && !recordings.isEmpty()) { if (recordings != null && !recordings.isEmpty()) {
State status = recordings.get(0).getStatus(); State status = recordings.get(0).getStatus();
if (event.getCode() == KeyCode.DELETE) { if (event.getCode() == KeyCode.DELETE) {
if(recordings.size() > 1 || status == FINISHED || status == FAILED) { if(recordings.size() > 1 || status == FINISHED || status == FAILED || status == WAITING) {
delete(recordings); delete(recordings);
} }
} else if (event.getCode() == KeyCode.ENTER && status == FINISHED) { } else if (event.getCode() == KeyCode.ENTER && status == FINISHED) {
@ -578,7 +577,7 @@ public class RecordingsTab extends Tab implements TabSelectionListener {
List<Recording> deleted = new ArrayList<>(); List<Recording> deleted = new ArrayList<>();
for (Iterator<JavaFxRecording> iterator = recordings.iterator(); iterator.hasNext();) { for (Iterator<JavaFxRecording> iterator = recordings.iterator(); iterator.hasNext();) {
JavaFxRecording r = iterator.next(); JavaFxRecording r = iterator.next();
if(r.getStatus() != FINISHED && r.getStatus() != FAILED) { if(r.getStatus() != FINISHED && r.getStatus() != FAILED && r.getStatus() != State.WAITING) {
continue; continue;
} }
try { try {