Mercurial > audlegacy

changeset 196:b3b2fc5c8fe9 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - Fix playback-stop RPC call crash. - Fix shutdown RPC call crash.
author nenolod
date Tue, 15 Nov 2005 19:24:17 -0800
parents 2e17a416825b
children ccd034857702
files audacious/main.c audacious/mainwin.c
diffstat 2 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/audacious/main.c	Tue Nov 15 00:44:39 2005 -0800
+++ b/audacious/main.c	Tue Nov 15 19:24:17 2005 -0800
@@ -556,10 +556,13 @@
         g_free(str);
     }
 
-    if (bmp_active_skin->path)
-        bmp_cfg_db_set_string(db, NULL, "skin", bmp_active_skin->path);
-    else
-        bmp_cfg_db_unset_key(db, NULL, "skin");
+    if (bmp_active_skin != NULL)
+    {
+        if (bmp_active_skin->path)
+            bmp_cfg_db_set_string(db, NULL, "skin", bmp_active_skin->path);
+        else
+            bmp_cfg_db_unset_key(db, NULL, "skin");
+    }
 
     if (get_current_output_plugin())
         bmp_cfg_db_set_string(db, NULL, "output_plugin",
--- a/audacious/mainwin.c	Tue Nov 15 00:44:39 2005 -0800
+++ b/audacious/mainwin.c	Tue Nov 15 19:24:17 2005 -0800
@@ -684,6 +684,8 @@
     plugin_system_cleanup();
     
     gtk_main_quit();
+
+    exit(EXIT_SUCCESS);
 }
 
 static void
@@ -859,6 +861,9 @@
 void
 mainwin_clear_song_info(void)
 {
+    if (!mainwin)
+        return;
+
     /* clear title */
     G_LOCK(mainwin_title);
     g_free(mainwin_title_text);