[maemo-commits] [maemo-commits] r15120 - in projects/haf/trunk/hildon-input-method: . src

[From: subversion at stage.maemo.org]

Author: tjunnone
Date: 2008-01-31 13:16:36 +0200 (Thu, 31 Jan 2008)
New Revision: 15120

Modified:
   projects/haf/trunk/hildon-input-method/ChangeLog
   projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
Log:
* src/hildon-im-ui.c: Fix rare crash on toggling the  
  special plugin. Fixes NB#78312.


Modified: projects/haf/trunk/hildon-input-method/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method/ChangeLog	2008-01-25 17:35:57 UTC (rev 15119)
+++ projects/haf/trunk/hildon-input-method/ChangeLog	2008-01-31 11:16:36 UTC (rev 15120)
@@ -1,3 +1,8 @@
+2008-01-31  Tomas Junnonen  <tomas.junnonen at nokia.com>
+
+	* src/hildon-im-ui.c: Fix rare crash on toggling the
+	  special plugin. Fixes NB#78312.
+
 2008-01-11  Richard Sun  <richard.sun at nokia.com>
 
 	* Version 2.0.0

Modified: projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
===================================================================
--- projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2008-01-25 17:35:57 UTC (rev 15119)
+++ projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2008-01-31 11:16:36 UTC (rev 15120)
@@ -1747,11 +1747,11 @@
 
   info = CURRENT_PLUGIN (self);
 
-  if (info->info->special_plugin == NULL)
+  if (info && info->info->special_plugin == NULL)
   {
     hildon_im_ui_restore_previous_mode_real(self);
   }
-  else
+  else if (info)
   {
     hildon_im_ui_activate_plugin (self, info->info->special_plugin, TRUE);
   }