From: handa <handa>
Date: Thu, 24 May 2007 07:05:46 +0000 (+0000)
Subject: (load_branch): Fix previous change.
X-Git-Tag: FLT-base~38
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c77039e8cae07c77c7b14f67f31566fa17d8237b;p=m17n%2Fm17n-lib.git

(load_branch): Fix previous change.
(update_global_info): If the global database is not found, return -1.
---

diff --git a/src/input.c b/src/input.c
index 3175ce0..fa4f0d5 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1073,7 +1073,7 @@ load_branch (MInputMethodInfo *im_info, MPlist *plist, MIMMap *map)
   else if (im_info->maps) 
     {
       plist = (MPlist *) mplist_get (im_info->maps, map_name);
-      if (! plist)
+      if (! plist && im_info->configured_vars)
 	{
 	  MPlist *p = mplist__assq (im_info->configured_vars, map_name);
 
@@ -1493,6 +1493,8 @@ update_global_info (void)
     {
       MDatabase *mdb = mdatabase_find (Minput_method, Mt, Mnil, Mglobal);
 
+      if (! mdb)
+	return -1;
       global_info = new_im_info (mdb, Mt, Mnil, Mglobal, im_info_list);
     }
   if (! global_info->mdb