From 5e6f7453ef9c524a11da9cb7e578fce24d8531a6 Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 6 Sep 2015 17:56:19 +0000 Subject: [PATCH] Prevent building exclusive between filter that can't return any results --- .../src/main/java/forge/itemmanager/AdvancedSearch.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java index a0ea3209874..1402369b7a6 100644 --- a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java +++ b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java @@ -608,7 +608,11 @@ public class AdvancedSearch { if (operator.valueCount == FilterValueCount.TWO) { //prompt for upper bound if needed message = lowerBound + message.substring(1) + " ?"; - Integer upperBound = SGuiChoose.getInteger(message, lowerBound, max); + int upperBoundMin = lowerBound; + if (operator == FilterOperator.BETWEEN_EXCLUSIVE) { + upperBoundMin += 2; //if exclusive, ensure it's possible to have numbers in between + } + Integer upperBound = SGuiChoose.getInteger(message, upperBoundMin, max); if (upperBound == null) { return null; } values.add(upperBound);