From 9c3c76e70ddfae66f9cceae6be8a1c27b78a7848 Mon Sep 17 00:00:00 2001 From: LindaJuffermans Date: Tue, 28 Jul 2020 11:23:04 +0200 Subject: [PATCH] Added NULL check for missing encodingPreset (fixes #288) --- .../java/com/replaymod/render/gui/GuiRenderSettings.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java index 75d60f95..e6d43fa9 100644 --- a/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java +++ b/src/main/java/com/replaymod/render/gui/GuiRenderSettings.java @@ -487,10 +487,8 @@ public class GuiRenderSettings extends GuiScreen implements Closeable { renderMethodDropdown.setSelected(settings.getRenderMethod()); } RenderSettings.EncodingPreset encodingPreset = settings.getEncodingPreset(); - if (!encodingPreset.isSupported()) { - encodingPreset = null; - } - if (encodingPreset == null) { + /* encodingPreset can be null from a previously supported and later removed preset */ + if (encodingPreset == null || !encodingPreset.isSupported()) { encodingPreset = getDefaultRenderSettings().getEncodingPreset(); } encodingPresetDropdown.setSelected(encodingPreset);