X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmulti-language-support-impl.cpp;h=f251025a6b314ed8662c459d7c216168ab655f7b;hp=4c68a74d5bd6613f97bd7aa26d9c06eb468a63b6;hb=bbb87601fa60e55b9fab364747befef8c8ca9042;hpb=a3390cb9c1cd0aeddbcd4aa89d6045592a123dd3

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index 4c68a74..f251025 100644
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -29,6 +29,7 @@
 #include <dali-toolkit/internal/text/logical-model.h>
 #include <dali-toolkit/internal/text/font-run.h>
 #include <dali-toolkit/internal/text/script-run.h>
+#include <dali-toolkit/internal/text/text-io.h>
 
 namespace Dali
 {
@@ -484,7 +485,7 @@ void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
             // The font is not valid. Set to zero and a default one will be set.
             fontId = 0u;
           }
-          else
+          else if( !IsValidForAllScripts( character ) )
           {
             // Add the font to the valid font cache.
             validateFontsPerScript = new ValidateFontsPerScript();
@@ -494,7 +495,7 @@ void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
           }
         }
       }
-    }
+    } // !isDefault
 
     // The font has not been validated. Find a default one.
     if( 0u == fontId )