changeset 2480:bb2f191895ce trunk

[svn] - fixed crash when skipping to next song with an empty playlist
author marvin
date Tue, 06 Feb 2007 06:06:58 -0800
parents 358edfe97cfa
children 40adfa8fbc11
files ChangeLog src/audacious/build_stamp.c src/audacious/playlist.c src/audacious/ui_main.c
diffstat 4 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 05 17:54:57 2007 -0800
+++ b/ChangeLog	Tue Feb 06 06:06:58 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-06 01:54:57 +0000  
+  revision [3968]
+  * Update Japanese translation.
+  
+  trunk/po/ja.po |    4 ++--
+  1 file changed, 2 insertions(+), 2 deletions(-)
+
+
 2007-02-06 00:28:03 +0000  Giacomo Lozito <james@develia.org>
   revision [3966]
   - prevent player from crashing when bmp_cfg_db_get_string(db, CDDA, directory, &path) in add_medium returns FALSE
--- a/src/audacious/build_stamp.c	Mon Feb 05 17:54:57 2007 -0800
+++ b/src/audacious/build_stamp.c	Tue Feb 06 06:06:58 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070206-3966";
+const gchar *svn_stamp = "20070206-3968";
--- a/src/audacious/playlist.c	Mon Feb 05 17:54:57 2007 -0800
+++ b/src/audacious/playlist.c	Tue Feb 06 06:06:58 2007 -0800
@@ -1044,8 +1044,7 @@
 {
     GList *plist_pos_list;
     gboolean restart_playing = FALSE;
-
-    if (!playlist)
+    if (!playlist_get_length(playlist))
         return;
 
     PLAYLIST_LOCK(playlist->mutex);
@@ -1103,7 +1102,7 @@
     GList *plist_pos_list;
     gboolean restart_playing = FALSE;
 
-    if (!playlist)
+    if (!playlist_get_length(playlist))
         return;
 
     PLAYLIST_LOCK(playlist->mutex);
--- a/src/audacious/ui_main.c	Mon Feb 05 17:54:57 2007 -0800
+++ b/src/audacious/ui_main.c	Tue Feb 06 06:06:58 2007 -0800
@@ -2131,7 +2131,6 @@
 mainwin_fwd_pushed(void)
 {
     g_get_current_time(&cb_time);
-
     seek_initial_pos = hslider_get_position(mainwin_position);
     seek_state = MAINWIN_SEEK_FWD;
 }
@@ -2152,7 +2151,7 @@
 
     if ( now_dur <= TRISTATE_THRESHOLD )
     {
-        /* interpret as 'skip to previous song' */
+        /* interpret as 'skip to next song' */
         playlist_next(playlist_get_active());
     }
     else