Merge pull request #1334 from moadib/gles20

Fixed statement which works but incorrect from point of C++ standard
2012-09-19 20:10:15 -07:00 · 2012-09-19 20:10:15 -07:00 · d662082ef1
parent 72356d1a84 6df8233b03
commit d662082ef1
1 changed files with 4 additions and 1 deletions
--- a/cocos2dx/platform/win32/CCImage.cpp
+++ b/cocos2dx/platform/win32/CCImage.cpp
@ -152,7 +152,10 @@ public:
 						pwszBuffer = NULL;
 					}
 				}
-				fontPath.size()>0?(m_curFontPath = fontPath):(m_curFontPath.clear());
+				if (fontPath.size() > 0)
+					m_curFontPath = fontPath;
+				else
+					m_curFontPath.clear();
 				// register temp font
 				if (m_curFontPath.size() > 0)
 				{