Autum cup 2 decider

app/actors/LobbieActor.scala

@@ -130,12 +130,12 @@ class LobbieActor(hostUser: LobbyUser) extends Actor with LazyLogging {
       sender ! SetUserAsObs(getLobbyInfoResponse)
     case LeaveLobby =>
       users = users - sender
-      if(secondPlayer.exists(sp => sp.actorRef == sender)) secondPlayer = None
       if(host.actorRef == sender()){
         users.foreach(_ ! HostLeaveLobby)
         context.stop(self)
       }else if(secondPlayer.exists(_.actorRef == sender())){
         users.foreach(_ ! SecondPlayerLeaveLobby)
+        secondPlayer = None
         context.stop(self)
       }
       if (users.isEmpty) {
@@ -165,12 +165,12 @@ case class MapsUpdate(maps: Set[String])
 
 case class CreateLobby(userName: String)
 
-case class WatchLobby(lobbyName: String)
-
 case class JoinLobbyAsPlayer(lobbyUser: LobbyUser)
 
 case object KickSecondPlayer
 
+case class WatchLobby(lobbyName: String)
+
 case object LeaveLobby
 
 case object SetReady