changeset 4498:e8b8b22ce567

Automated merge with ssh://hg.atheme.org//hg/audacious
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 21 Apr 2008 16:10:32 +0300
parents 994bffce017c (current diff) 0f43f3a5eb12 (diff)
children 9cd1dca94b2a
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/main.c	Mon Apr 21 08:59:30 2008 +0300
+++ b/src/audacious/main.c	Mon Apr 21 16:10:32 2008 +0300
@@ -676,6 +676,8 @@
 
     playlist_stop_get_info_thread();
 
+    aud_config_save();
+
     if (options.headless == FALSE)
     {
         gtk_widget_hide(equalizerwin);
@@ -688,7 +690,6 @@
         cleanup_skins();
     }
 
-    aud_config_save();
     plugin_system_cleanup();
 
     /* free and clear each playlist */
--- a/src/audacious/skin.c	Mon Apr 21 08:59:30 2008 +0300
+++ b/src/audacious/skin.c	Mon Apr 21 16:10:32 2008 +0300
@@ -551,6 +551,7 @@
 void cleanup_skins()
 {
     skin_destroy(aud_active_skin);
+    aud_active_skin = NULL;
 }