From 3471515bddf69b30c9a7956077a0c40c83c3b128 Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Thu, 13 Apr 2017 20:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=B0=8F=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/style/color/ColorSelectConfigManager.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/designer_base/src/com/fr/design/style/color/ColorSelectConfigManager.java b/designer_base/src/com/fr/design/style/color/ColorSelectConfigManager.java
index af3d7df81..e135b17c6 100644
--- a/designer_base/src/com/fr/design/style/color/ColorSelectConfigManager.java
+++ b/designer_base/src/com/fr/design/style/color/ColorSelectConfigManager.java
@@ -84,6 +84,9 @@ public class ColorSelectConfigManager extends XMLFileManager implements ColorSel
      * @param color 颜色
      */
     public void addToColorQueue(Color color) {
+        if(color == null){
+            return;
+        }
         // 过滤重复的最近使用颜色
         // 因为有个后进先出的问题，最近使用的颜色需要放到最前面所以没用set
         if (colors.contains(color)) {