summaryrefslogtreecommitdiffstats
path: root/lib/class/localplay.class.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-09-09 06:13:32 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-09-09 06:13:32 +0000
commitb3950d0c942364ce9ab2e99c6914977158b2a09c (patch)
tree64bf2dbe591ec7d74acb4602ca152c771430f079 /lib/class/localplay.class.php
parentf4ad61dccfd3b92760659f0382ca51a14e92a8b8 (diff)
downloadampache-b3950d0c942364ce9ab2e99c6914977158b2a09c.tar.gz
ampache-b3950d0c942364ce9ab2e99c6914977158b2a09c.tar.bz2
ampache-b3950d0c942364ce9ab2e99c6914977158b2a09c.zip
new db update, moved prefs around removed useless one and fixed some defaults, also fixed some potential issues with lastfm
Diffstat (limited to 'lib/class/localplay.class.php')
-rw-r--r--lib/class/localplay.class.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php
index 3f8dbb8a..e048dd17 100644
--- a/lib/class/localplay.class.php
+++ b/lib/class/localplay.class.php
@@ -224,6 +224,9 @@ class Localplay {
// Load the controller and then check for its preferences
$localplay = new Localplay($controller);
+ // If we can't even load it no sense in going on
+ if (!isset($localplay->_player)) { return false; }
+
$preferences = $localplay->get_preferences();
foreach ($preferences as $preference) {
@@ -575,7 +578,7 @@ class Localplay {
*/
public function get_preferences() {
- $preferences = $this->_player->preferences();
+ $preferences = $this->_player->get_preferences();
return $preferences;