From 424d046b6714c8e1579021e27165e9c153b0845d Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Fri, 3 Jan 2020 12:24:02 +0100 Subject: [PATCH] Fix possible NPE in filter function --- client/src/main/java/ctbrec/ui/ThumbOverviewTab.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java b/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java index f4064dc1..25901d6f 100644 --- a/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java +++ b/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java @@ -13,6 +13,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ExecutionException; @@ -786,7 +787,7 @@ public class ThumbOverviewTab extends Tab implements TabSelectionListener { } private boolean modelPropertiesMatchToken(String token, Model m) throws IOException, ExecutionException { - int[] resolution = m.getStreamResolution(true); + int[] resolution = Optional.ofNullable(m.getStreamResolution(true)).orElse(new int[2]); String searchText = createSearchText(m); boolean tokensMissing = false; if (token.matches(">\\d+")) { @@ -817,7 +818,7 @@ public class ThumbOverviewTab extends Tab implements TabSelectionListener { for (String tag : m.getTags()) { searchTextBuilder.append(tag).append(' '); } - int[] resolution = m.getStreamResolution(true); + int[] resolution = Optional.ofNullable(m.getStreamResolution(true)).orElse(new int[2]); searchTextBuilder.append(resolution[1]); return searchTextBuilder.toString().trim(); }