rhythmbox r5587 - in trunk: . shell

[jmatthew svn gnome org]

Author: jmatthew
Date: Mon Feb 18 12:48:54 2008
New Revision: 5587
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5587&view=rev

Log:
2008-02-18  Jonathan Matthew  <jonathan d14n org>

	* shell/rb-shell-player.c: (rb_shell_player_handle_eos_unlocked):
	Fix stats update for ERROR, STOP and RETRY EOS actions so stats are
	only updated once.


Modified:
   trunk/ChangeLog
   trunk/shell/rb-shell-player.c

Modified: trunk/shell/rb-shell-player.c
==============================================================================
--- trunk/shell/rb-shell-player.c	(original)
+++ trunk/shell/rb-shell-player.c	Mon Feb 18 12:48:54 2008
@@ -710,7 +710,7 @@
 		return;
 	}
 
-	update_stats = TRUE;
+	update_stats = FALSE;
 	switch (rb_source_handle_eos (source)) {
 	case RB_SOURCE_EOF_ERROR:
 		if (allow_stop) {
@@ -718,12 +718,14 @@
 					 _("Unexpected end of stream!"));
 			rb_shell_player_set_playing_source (player, NULL);
 			player->priv->playing_entry_eos = TRUE;
+			update_stats = TRUE;
 		}
 		break;
 	case RB_SOURCE_EOF_STOP:
 		if (allow_stop) {
 			rb_shell_player_set_playing_source (player, NULL);
 			player->priv->playing_entry_eos = TRUE;
+			update_stats = TRUE;
 		}
 		break;
 	case RB_SOURCE_EOF_RETRY: {
@@ -755,6 +757,7 @@
 				rb_shell_player_play_entry (player, entry, NULL);
 			}
 			player->priv->playing_entry_eos = TRUE;
+			update_stats = TRUE;
 		}
 	}
 		break;
@@ -763,6 +766,7 @@
 			GError *error = NULL;
 
 			player->priv->playing_entry_eos = TRUE;
+			update_stats = TRUE;
 			if (!rb_shell_player_do_next_internal (player, TRUE, allow_stop, &error)) {
 				if (error->domain != RB_SHELL_PLAYER_ERROR ||
 				    error->code != RB_SHELL_PLAYER_ERROR_END_OF_PLAYLIST) {