Fixes #86

musiqpad · May 15, 2016 · 69659c5 · 69659c5
1 parent 3f56028
commit 69659c5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/socketserver/socketserver.js b/socketserver/socketserver.js
@@ -1108,6 +1108,13 @@ var SocketServer = function(server){
 						break;
 					}
 					var res = that.room.queue.swap(user1Sock, user2Sock);
+					if(!res.data) {
+						returnObj.data = {
+							error: 'SwappingWithCurrentDJ'
+						};
+						socket.sendJSON(returnObj);
+						break;	
+					}
 					res.data.mid = socket.user.uid;
 					returnObj.data = {
 						success: res.success

diff --git a/webserver/public/lib/js/app.js b/webserver/public/lib/js/app.js
@@ -3493,7 +3493,14 @@
 			};
 
 			obj.id = MP.addCallback(obj.type, function(err, data){
-				if (err){ if (callback) callback(err); console.log('Could not swap users in dj queue: ' + err); return;}
+				if (err) {
+					if (callback) callback(err);
+					MP.makeAlertModal({
+						content: 'Could not swap users in dj queue: ' + err,
+						dismissable: true
+					});
+					return;
+				}
 
 				if (callback) callback(err, data);
 			});