From a3138abd3867cdf31578379f1e2733dd3ca2618d Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Mon, 27 May 2013 21:12:07 -0400
Subject: [PATCH] more fixes

---
 database.js                | 4 ++--
 www/assets/js/callbacks.js | 1 -
 www/channel.html           | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/database.js b/database.js
index fdc4ef50..e5963645 100644
--- a/database.js
+++ b/database.js
@@ -239,12 +239,12 @@ function registerChannel(name) {
 }
 
 function loadChannel(chan) {
-    if(!name.match(/^[a-zA-Z0-9-_]+$/)) {
+    if(!chan.name.match(/^[a-zA-Z0-9-_]+$/)) {
         return false;
     }
     var db = getConnection();
     if(!db) {
-        return;
+        return false;
     }
 
     var query = createQuery(
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index e9a9d027..74d834f9 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -617,7 +617,6 @@ Callbacks = {
     },
 
     changeMedia: function(data) {
-        console.log(data);
         $("#currenttitle").text("Currently Playing: " + data.title);
         if(data.type != "sc" && PLAYER.type == "sc")
             // [](/goddamnitmango)
diff --git a/www/channel.html b/www/channel.html
index bfb314b6..f525b2f3 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -292,10 +292,10 @@
     <script src="./assets/js/jquery.js"></script>
     <!-- My Javascript -->
     <script src="./assets/js/iourl.js"></script>
-    <script src="./assets/js/functions.js"></script>
-    <script src="./assets/js/callbacks.js"></script>
     <script src="./assets/js/media.js"></script>
+    <script src="./assets/js/functions.js"></script>
     <script src="./assets/js/client.js"></script>
+    <script src="./assets/js/callbacks.js"></script>
     <!-- APIs -->
     <script src="http://api.dmcdn.net/all.js"></script>
     <script src="http://jwpsrv.com/library/QouFCLBMEeKC+CIACpYGxA.js"></script>