From 122c3a3cf8340b5737e0b954cc4fa6b2d03b68ab Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 4 Aug 2011 01:26:29 +0200
Subject: [PATCH] dont show confusing 'X files scanned' message when we are not
 scanning files

---
 apps/media/js/collection.js         | 2 +-
 apps/media/js/scanner.js            | 2 ++
 apps/media/templates/collection.php | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 42d249112b..520ce7d112 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -33,7 +33,7 @@ Collection={
 						Collection.loadedListeners[i]();
 					}
 					if(collection.length==0){
-						$('#scan input.start').val('Scan');
+						$('#scan input.start').val('Scan Collection');
 						$('#plugins a[href="#collection"]').trigger('click');
 					}
 					
diff --git a/apps/media/js/scanner.js b/apps/media/js/scanner.js
index de67c7c993..165f86d05f 100644
--- a/apps/media/js/scanner.js
+++ b/apps/media/js/scanner.js
@@ -50,6 +50,7 @@ Scanner={
 	},
 	start:function(ready){
 		Scanner.stopScanning=false;
+		$('#scancount').show();
 		var scanSong=function(){
 			Scanner.currentIndex++;
 			if(!Scanner.stopScanning && Scanner.currentIndex<Scanner.songs.length){
@@ -62,6 +63,7 @@ Scanner={
 			}
 		}
 		scanSong();
+		scanSong();
 	},
 	toggle:function(){
 		if(Scanner.stopScanning){
diff --git a/apps/media/templates/collection.php b/apps/media/templates/collection.php
index fe50bf5ebd..f47cba2486 100644
--- a/apps/media/templates/collection.php
+++ b/apps/media/templates/collection.php
@@ -1,7 +1,7 @@
 <div id='scan'>
-	<p><span class='songCount'>0</span> Songs scanned</p>
+	<p id='scancount' style='display:none'><span class='songCount'>0</span> Songs scanned</p>
 	<div id="scanprogressbar"></div>
-	<input type='button' class='start' value='Recan'></input>
+	<input type='button' class='start' value='Recan Collection'></input>
 	<input type='button' class='stop' style='display:none' value='Pause'></input>
 </div>
 <ul id='collection'>