From eda93f0776068771b806b803ea57aec0a269bd61 Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Thu, 1 Apr 2021 08:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Theme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Runtime/Component/Theme/ChartTheme.cs | 11 ++++++++---
 Runtime/Internal/BaseChart.cs         |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Runtime/Component/Theme/ChartTheme.cs b/Runtime/Component/Theme/ChartTheme.cs
index 9e98d2c4..33d42225 100644
--- a/Runtime/Component/Theme/ChartTheme.cs
+++ b/Runtime/Component/Theme/ChartTheme.cs
@@ -296,10 +296,15 @@ namespace XCharts
                 case Theme.Light: CopyTheme(Light); break;
                 case Theme.Dark: CopyTheme(Dark); break;
                 case Theme.Custom:
-                    var sour = XThemeMgr.GetTheme(themeName);
-                    if (sour != null)
+                    var sourTheme = XThemeMgr.GetTheme(themeName);
+                    if (sourTheme != null)
                     {
-                        CopyTheme(sour);
+                        CopyTheme(sourTheme);
+                    }
+                    else
+                    {
+                        Debug.LogWarning("ResetTheme:can't find theme:" + themeName + ", reset to Default theme");
+                        CopyTheme(Default);
                     }
                     break;
             }
diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs
index 4fdf765e..f951bfa1 100644
--- a/Runtime/Internal/BaseChart.cs
+++ b/Runtime/Internal/BaseChart.cs
@@ -117,6 +117,10 @@ namespace XCharts
                 {
                     m_Theme.font = XChartsSettings.font;
                 }
+                if (m_Theme.colorPalette.Count == 0)
+                {
+                    m_Theme.ResetTheme();
+                }
             }
             base.Awake();
             m_Series.AnimationReset();