From 189aa18afb58a4a67ac1ad8044f05f1720232b0f Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Tue, 11 Aug 2015 15:03:49 +0200 Subject: [PATCH] Prevent NPE when removing the last Element from the "Connect Replays" list --- .../replaymod/gui/replayeditor/GuiConnectPart.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiConnectPart.java b/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiConnectPart.java index 0798f3d4..3febfcef 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiConnectPart.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiConnectPart.java @@ -128,6 +128,7 @@ public class GuiConnectPart extends GuiStudioPart { filesToConcat.set(concatList.getSelectionIndex(), replayDropdown.getElement(selectionIndex)); concatList.setElements(filesToConcat); } catch(Exception e) { + e.printStackTrace(); // TODO Prevent exception } } @@ -136,7 +137,15 @@ public class GuiConnectPart extends GuiStudioPart { concatList.addSelectionListener(new SelectionListener() { @Override public void onSelectionChanged(int selectionIndex) { - String selName = concatList.getElement(selectionIndex).getDisplayString(); + GuiEntryListStringEntry entry = concatList.getElement(selectionIndex); + if(entry == null) { + removeButton.enabled = false; + return; + } else { + removeButton.enabled = true; + } + + String selName = entry.getDisplayString(); int i = 0; for(Object s : replayDropdown.getAllElements()) { String str = ((GuiEntryListStringEntry)s).getDisplayString();