From 43d8bf513872fb21831ef7f5957d20bf37e446a4 Mon Sep 17 00:00:00 2001
From: Zhanghu <hoo.zhang@qq.com>
Date: Wed, 3 Jun 2015 09:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93PainManager=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=B6=E6=8A=9B=E5=87=BA?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DuiLib/Core/UIManager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/DuiLib/Core/UIManager.cpp b/DuiLib/Core/UIManager.cpp
index dc54a50..f976187 100644
--- a/DuiLib/Core/UIManager.cpp
+++ b/DuiLib/Core/UIManager.cpp
@@ -2491,7 +2491,8 @@ void CPaintManagerUI::ProcessMultiLanguageTokens(CDuiString& pStrMultiLanguage)
 			while( isdigit(pStrMultiLanguage.GetAt(iEndPos)) ) iEndPos++;
 			if( pStrMultiLanguage.GetAt(iEndPos) == '}' ) {
 				LPCTSTR pStrTemp = CPaintManagerUI::GetMultiLanguageString((UINT)_ttoi(pStrMultiLanguage.GetData() + iPos + 2));
-				pStrMultiLanguage.Replace(pStrMultiLanguage.Mid(iPos, iEndPos - iPos + 1), pStrTemp);
+                if (pStrTemp)
+				    pStrMultiLanguage.Replace(pStrMultiLanguage.Mid(iPos, iEndPos - iPos + 1), pStrTemp);
 			}
 		}
 		iPos = pStrMultiLanguage.Find(_T('%'), iPos + 1);