Fix: Return empty array if currentDJ or waitingDJs is null for getWai…

…tList & getDJs Fixes #145
plugCubed · Oct 20, 2017 · 8e63576 · 8e63576
1 parent c7a28ef
commit 8e63576
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/room.js b/lib/room.js
@@ -682,6 +682,10 @@ class Room {
      * @returns {User[]} An Array of all DJs in the room and the current DJ.
      */
     getDJs() {
+        if (this.booth.currentDJ == null || this.booth.waitingDJs == null) {
+            return [];
+        }
+
         return this.usersToArray([this.booth.currentDJ].concat(this.booth.waitingDJs));
     }
 
@@ -690,6 +694,10 @@ class Room {
      * @returns {User[]}  An Array of all DJs in the room that are in waitlist
      */
     getWaitList() {
+        if (this.booth.waitingDJs == null) {
+            return [];
+        }
+
         return this.usersToArray(this.booth.waitingDJs);
     }