PST gets correct round when not finished and TP != 0

frontend/core/src/com/gameware/game/states/PlayStateTemplate.java

@@ -66,7 +66,7 @@ public abstract class PlayStateTemplate extends State {
             gsm.set(new ScoreState(gsm, this.score, new FinishedTournamentState(gsm, tournament)));
         } else{
             //Tournament not finished
-            if(rc.isNextRound()) {
+            if(updatedRound.getTournamentPoints() != 0) {
                 try {
                     //Get new round if ready
                     Round nextRound = QueryIntermediate.getRoundFromTournament(tournament.get_id(), GameWare.getInstance().getPlayer().getId(), updatedRound.getRoundNr()+1);
@@ -74,10 +74,11 @@ public abstract class PlayStateTemplate extends State {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-            }
+            } else {
                 gsm.set(new ScoreState(gsm, this.score, new ViewTournamentState(gsm, tournament, updatedRound)));
             }
         }
+    }
 
     public void setScore(int score){
         this.score = score;