From: handa <handa>
Date: Mon, 5 Oct 2009 11:06:25 +0000 (+0000)
Subject: Fix previous change.
X-Git-Tag: merge-to-XML~57
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=363a64830ca93ac27628e332499afba94d6badf8;p=m17n%2Fm17n-lib.git

Fix previous change.
---

diff --git a/src/m17n-flt.c b/src/m17n-flt.c
index 0ca5d80..306233e 100644
--- a/src/m17n-flt.c
+++ b/src/m17n-flt.c
@@ -2611,7 +2611,7 @@ mflt_find (int c, MFLTFont *font)
  found:
   if (! CHECK_FLT_STAGES (flt))
     return NULL;
-  if (font && flt->need_config)
+  if (font && flt->need_config && mflt_font_id)
     flt = configure_flt (flt, font, mflt_font_id (font));
   return flt;
 }
@@ -2780,7 +2780,7 @@ mflt_run (MFLTGlyphString *gstring, int from, int to,
 
       MDEBUG_PRINT1 (" [FLT] (%s", MSYMBOL_NAME (flt->name));
 
-      if (flt->need_config)
+      if (flt->need_config && font_id != Mnil)
 	flt = configure_flt (flt, font, font_id);
 
       for (; this_to < to; this_to++)