r18269 - gnucash/trunk/src/backend/sql - Avoid CRIT message when loading root account which has NULL commodity.

[Phil Longstaff]

Author: plongstaff
Date: 2009-08-22 14:56:23 -0400 (Sat, 22 Aug 2009)
New Revision: 18269
Trac: http://svn.gnucash.org/trac/changeset/18269

Modified:
   gnucash/trunk/src/backend/sql/gnc-commodity-sql.c
Log:
Avoid CRIT message when loading root account which has NULL commodity.


Modified: gnucash/trunk/src/backend/sql/gnc-commodity-sql.c
===================================================================
--- gnucash/trunk/src/backend/sql/gnc-commodity-sql.c	2009-08-21 20:39:54 UTC (rev 18268)
+++ gnucash/trunk/src/backend/sql/gnc-commodity-sql.c	2009-08-22 18:56:23 UTC (rev 18269)
@@ -259,10 +259,12 @@
 	g_assert( val != NULL );
     (void)string_to_guid( g_value_get_string( val ), &guid );
 	commodity = gnc_commodity_find_commodity_by_guid( &guid, be->primary_book );
-    if( table_row->gobj_param_name != NULL ) {
-		g_object_set( pObject, table_row->gobj_param_name, commodity, NULL );
-    } else if( setter != NULL ) {
-		(*setter)( pObject, (const gpointer)commodity );
+	if( commodity != NULL ) {
+    	if( table_row->gobj_param_name != NULL ) {
+			g_object_set( pObject, table_row->gobj_param_name, commodity, NULL );
+    	} else if( setter != NULL ) {
+			(*setter)( pObject, (const gpointer)commodity );
+		}
     }
 }