From 39a7c5f79b9959aff401a1d8d714cf262af39d48 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Wed, 7 Nov 2018 20:08:06 +0100 Subject: [PATCH] Avoid NPE when context menu is triggered in empty table --- src/main/java/ctbrec/ui/RecordingsTab.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/ctbrec/ui/RecordingsTab.java b/src/main/java/ctbrec/ui/RecordingsTab.java index e64184f0..13a0701b 100644 --- a/src/main/java/ctbrec/ui/RecordingsTab.java +++ b/src/main/java/ctbrec/ui/RecordingsTab.java @@ -139,9 +139,11 @@ public class RecordingsTab extends Tab implements TabSelectionListener { table.setItems(observableRecordings); table.addEventHandler(ContextMenuEvent.CONTEXT_MENU_REQUESTED, event -> { Recording recording = table.getSelectionModel().getSelectedItem(); - popup = createContextMenu(recording); - if(!popup.getItems().isEmpty()) { - popup.show(table, event.getScreenX(), event.getScreenY()); + if(recording != null) { + popup = createContextMenu(recording); + if(!popup.getItems().isEmpty()) { + popup.show(table, event.getScreenX(), event.getScreenY()); + } } event.consume(); });