Merge pull request #114 from LoveEevee/songselect-fix-p2-importsongs

SongSelect: Fix P2 working after importing songs

public/src/js/songselect.js

@@ -277,7 +277,9 @@ class SongSelect{
 			"shift": ["x"]
 		})
 		
+		if(!assets.customSongs){
 			this.startP2()
+		}
 		
 		pageEvents.keyAdd(this, "all", "down", this.keyDown.bind(this))
 		pageEvents.add(loader.screen, "mousemove", this.mouseMove.bind(this))
@@ -653,7 +655,7 @@ class SongSelect{
 			autoplay = true
 		}else if(shift){
 			autoplay = shift
-		}else{
+		}else if(p2.socket.readyState === 1 && !assets.customSongs){
 			multiplayer = ctrl
 		}
 		
@@ -1771,6 +1773,7 @@ class SongSelect{
 						index = i
 						return song.id === id
 					})
+					if(currentSong){
 						currentSong.p2Cursor = diffId
 						if(p2.session && currentSong.stars){
 							this.selectedSong = index
@@ -1780,6 +1783,7 @@ class SongSelect{
 							}
 						}
 					}
+				}
 			})
 		}
 	}