Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2147
Modified Files:
core.c
Log Message:
Fix Gaim's crash-on-exit bug in CVS HEAD
Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -p -r1.82 -r1.83
--- core.c 2 Sep 2005 09:09:04 -0000 1.82
+++ core.c 7 Sep 2005 04:37:02 -0000 1.83
@@ -157,7 +157,6 @@ gaim_core_quit(void)
gaim_savedstatuses_uninit();
gaim_status_uninit();
gaim_prefs_uninit();
- gaim_sound_uninit();
gaim_xfers_uninit();
gaim_debug_info("main", "Unloading all plugins\n");
@@ -167,6 +166,19 @@ gaim_core_quit(void)
if (ops != NULL && ops->quit != NULL)
ops->quit();
+ /*
+ * gaim_sound_uninit() should be called as close to
+ * shutdown as possible. This is because the call
+ * to ao_shutdown() can sometimes leave our
+ * environment variables in an unusable state, which
+ * can cause a crash when getenv is called (by gettext
+ * for example). See the complete bug report at
+ * http://trac.xiph.org/cgi-bin/trac.cgi/ticket/701
+ *
+ * TODO: Eventually move this call higher up with the others.
+ */
+ gaim_sound_uninit();
+
gaim_plugins_uninit();
gaim_signals_uninit();
|
