2 files changed, 4 insertions, 5 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index f68392ce..bfb96506 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -150,7 +150,8 @@ class Server_Add_Controller extends Admin_Controller {
             $queue[] = array($child, $entry->id);
           } else {
             $ext = strtolower(pathinfo($child, PATHINFO_EXTENSION));
-            if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4"))) {
+            if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4")) &&
+                filesize($child) > 0) {
               $child_entry = ORM::factory("server_add_file");
               $child_entry->task_id = $task->id;
               $child_entry->file = $child;
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index 989555cc..3348de4b 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -4,11 +4,9 @@
 function select_file(li) {
   $(li).toggleClass("selected");
   if ($("#gServerAdd span.selected").length) {
-    $("#gServerAddAddButton").enable(true);
-    $("#gServerAddAddButton").removeClass("ui-state-disabled");
+    $("#gServerAddAddButton").enable(true).removeClass("ui-state-disabled");
   } else {
-    $("#gServerAddAddButton").enable(false);
-    $("#gServerAddAddButton").addClass("ui-state-disabled");
+    $("#gServerAddAddButton").enable(false).addClass("ui-state-disabled");
   }
 }