From 8be939987a846f114a865ad603dd1d5d04983e3a Mon Sep 17 00:00:00 2001 From: Sol Date: Sat, 24 Nov 2012 15:39:31 +0000 Subject: [PATCH] - Check for null arrays before assigning in SDisplayUtil --- src/main/java/forge/gui/framework/SDisplayUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/gui/framework/SDisplayUtil.java b/src/main/java/forge/gui/framework/SDisplayUtil.java index 261c78b894d..500f465b20a 100644 --- a/src/main/java/forge/gui/framework/SDisplayUtil.java +++ b/src/main/java/forge/gui/framework/SDisplayUtil.java @@ -59,7 +59,9 @@ public class SDisplayUtil { if (counter != (steps - 1)) { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - pnl.setBackground(new Color(newR[counter], oldG, oldB, newA[counter])); + int r = newR == null ? oldR : newR[counter]; + int a = newA == null ? oldA : newR[counter]; + pnl.setBackground(new Color(r, oldG, oldB, a)); } }); }