# HG changeset patch
# User yaz
# Date 1160762882 25200
# Node ID b7cac9c9c4a1541d4469de367cff06b2118d7499
# Parent  1a801187f510627e0117b147ccf9378291179802
[svn] - audacious_determine_session_type() would crash if audacious_session_uri had value.

diff -r 1a801187f510 -r b7cac9c9c4a1 ChangeLog
--- a/ChangeLog	Thu Oct 12 21:12:58 2006 -0700
+++ b/ChangeLog	Fri Oct 13 11:08:02 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-13 04:12:58 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [2693]
+  - pls doesn't go along with PLAYLIST_LOCK in playlist_save().
+  
+  trunk/audacious/playlist.c |    2 --
+  1 file changed, 2 deletions(-)
+
+
 2006-10-12 15:10:01 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2691]
   - fix another regression where mainwin_othertext_visible is TRUE even though the skin doesn't want
diff -r 1a801187f510 -r b7cac9c9c4a1 libaudacious/beepctrl.c
--- a/libaudacious/beepctrl.c	Thu Oct 12 21:12:58 2006 -0700
+++ b/libaudacious/beepctrl.c	Fri Oct 13 11:08:02 2006 -0700
@@ -289,7 +289,7 @@
 
     if (audacious_session_uri != NULL)
     {
-	return audacious_session_uri;
+        return g_strdup(audacious_session_uri);
     }
 
     if (audacious_session_type != AUDACIOUS_TYPE_UNIX)
@@ -319,7 +319,7 @@
 gint *
 audacious_determine_session_type(gint session)
 {
-    gchar *uri;
+    gchar *uri = NULL;
 
     if (audacious_session_type != NULL)
     {