fixed url add to localplay, also changed some play links to add

2 files changed, 10 insertions, 0 deletions

diff --git a/lib/class/localplay.abstract.php b/lib/class/localplay.abstract.php
index 0d870b05..144c1918 100644
--- a/lib/class/localplay.abstract.php
+++ b/lib/class/localplay.abstract.php
@@ -52,6 +52,12 @@ abstract class localplay_controller {
 	 */
 	public function get_url($object) { 
 
+		// This might not be an object!
+		if (!is_object($object)) { 
+			// Stupiidly we'll just blindly add it for now
+			return $object; 		
+		} 
+
 		// This can get a little complicated
 		switch ($object_type) { 
 			case 'random': 
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php
index 793d5a6b..cc6e9dc1 100644
--- a/lib/class/stream.class.php
+++ b/lib/class/stream.class.php
@@ -459,6 +459,10 @@ class Stream {
 		foreach ($this->objects as $object) { 
 			$localplay->add($object); 
 		} 
+
+		foreach ($this->urls as $url) { 
+			$localplay->add($url); 
+		} 
 		
 		$localplay->play();