summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-23 20:31:30 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-23 20:31:30 +0000
commitcbdb592407c339d8158fb96e0253c1b34e011dc5 (patch)
treec5d0a955af83aa93953945820a4356f01b96d43d
parent07d0f509554333f0d7ea6c2d445fa8c4996ed07b (diff)
downloadampache-cbdb592407c339d8158fb96e0253c1b34e011dc5.tar.gz
ampache-cbdb592407c339d8158fb96e0253c1b34e011dc5.tar.bz2
ampache-cbdb592407c339d8158fb96e0253c1b34e011dc5.zip
fixed issue where streams would start even with no songs
-rwxr-xr-xdocs/CHANGELOG1
-rw-r--r--lib/class/stream.class.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index af1173f5..d876b3a0 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
--------------------------------------------------------------------------
v.3.4-Alpha4
+ - Fixed bug where stream would start even with no songs
- Upgraded to Prototype 1.6
- Added playlists and playlist_songs methods to API
- Fixed a problem with the javascript that was causing Opera to not
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php
index 9c1ad1e8..6d620f03 100644
--- a/lib/class/stream.class.php
+++ b/lib/class/stream.class.php
@@ -63,7 +63,7 @@ class Stream {
*/
public function start() {
- if (!is_array($this->songs)) {
+ if (!count($this->songs) AND !count($this->urls)) {
debug_event('stream','Error: No Songs Passed on ' . $this->type . ' stream','2');
return false;
}