# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177347608 0
# Node ID b75f27a09a927249698fecfbe989084f68971b6a
# Parent  786edf5e214454396ff6a743eed265f16d8cfb99# Parent  b1c1b2319616f6fc18ac20203bfbda544a4774da
propagate from branch 'im.pidgin.pidgin' (head f20ceeff726ad3a9ee267225bb6e69f971d759bb)
            to branch 'im.pidgin.rlaager.gaim_migration' (head 8e12d08fc6cab69616f4792a0c2112ebd426b456)

diff -r 786edf5e2144 -r b75f27a09a92 libpurple/prefs.c
--- a/libpurple/prefs.c	Mon Apr 23 16:57:12 2007 +0000
+++ b/libpurple/prefs.c	Mon Apr 23 17:00:08 2007 +0000
@@ -92,7 +92,16 @@
 	if (name[1] == '\0')
 		return &prefs;
 	else
-		return g_hash_table_lookup(prefs_hash, name);
+	{
+		/* When we're initializing, the debug system is
+		 * initialized before the prefs system, but debug
+		 * calls will end up calling prefs functions, so we
+		 * need to deal cleanly here. */
+		if (prefs_hash)
+			return g_hash_table_lookup(prefs_hash, name);
+		else
+			return NULL;
+	}
 }