[uim] r7407 committed - * Merge r7316 from trunk.

[codesite-noreply]

Revision: 7407
Author:   ek.kato
Date:     Tue Jan 10 23:08:17 2012
Log:      * Merge r7316 from trunk.

http://code.google.com/p/uim/source/detail?r=7407

Modified:
 /branches/1.7/qt/pref-customwidgets.cpp
 /branches/1.7/qt4/pref/customwidgets.cpp

=======================================
--- /branches/1.7/qt/pref-customwidgets.cpp     Thu Jan  6 18:09:56 2011
+++ /branches/1.7/qt/pref-customwidgets.cpp     Tue Jan 10 23:08:17 2012
@@ -327,9 +327,15 @@
     free( m_custom->value->as_choice->label );
     free( m_custom->value->as_choice->desc );

-    m_custom->value->as_choice->symbol = strdup( choice->symbol );
-    m_custom->value->as_choice->label  = strdup( choice->label );
-    m_custom->value->as_choice->desc   = strdup( choice->desc );
+    if ( choice ) {
+        m_custom->value->as_choice->symbol = strdup( choice->symbol );
+        m_custom->value->as_choice->label  = strdup( choice->label );
+        m_custom->value->as_choice->desc   = strdup( choice->desc );
+    } else {
+        m_custom->value->as_choice->symbol = strdup( "" );
+        m_custom->value->as_choice->label  = strdup( "" );
+        m_custom->value->as_choice->desc   = strdup( "" );
+    }

     setCustom( m_custom );
 }
=======================================
--- /branches/1.7/qt4/pref/customwidgets.cpp    Thu Jan  6 18:09:56 2011
+++ /branches/1.7/qt4/pref/customwidgets.cpp    Tue Jan 10 23:08:17 2012
@@ -338,9 +338,15 @@
     free( m_custom->value->as_choice->label );
     free( m_custom->value->as_choice->desc );

-    m_custom->value->as_choice->symbol = strdup( choice->symbol );
-    m_custom->value->as_choice->label  = strdup( choice->label );
-    m_custom->value->as_choice->desc   = strdup( choice->desc );
+    if ( choice ) {
+        m_custom->value->as_choice->symbol = strdup( choice->symbol );
+        m_custom->value->as_choice->label  = strdup( choice->label );
+        m_custom->value->as_choice->desc   = strdup( choice->desc );
+    } else {
+        m_custom->value->as_choice->symbol = strdup( "" );
+        m_custom->value->as_choice->label  = strdup( "" );
+        m_custom->value->as_choice->desc   = strdup( "" );
+    }

     setCustom( m_custom );
 }