X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=2b4aa7d7369160b42ec0275c616451eb4caefb89;hp=d169bdbd1b2209c8714378b7699ec488a6d94f5a;hb=98628c92a0eaca1fdbcd4a35b60b7fb78616c82a;hpb=3a708ad09d26d955393edfedbffdf668c58ccd48

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index d169bdb..2b4aa7d 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -308,17 +308,17 @@ void GroupScreen::draw(unsigned char *buf)
 	if (next_song != NULL) {
 		widestring text = widestring("Next player: ") + next_player->nick;
 		unsigned this_width = my_draw_text(text, NULL, 24.0);
-		my_draw_text(text, buf, 24.0, 400 - this_width/2, 450);
+		my_draw_text(text, buf, 24.0, 400 - this_width/2, 420);
 
 		if (next_song->song.id != -1) {
 			this_width = my_draw_text(next_song->song.title, NULL, 20.0);
-			my_draw_text(next_song->song.title, buf, 20.0, 400 - this_width/2, 487);
+			my_draw_text(next_song->song.title, buf, 20.0, 400 - this_width/2, 457);
 
 			// fetch the high score later
 			text = widestring("High score: ") + widestring(pqxx::to_string(1234)) +
 				widestring(", by dufF in Challenge Cup 1, 2004");
 			this_width = my_draw_text(text, NULL, 16.0);
-			my_draw_text(text, buf, 16.0, 400 - this_width/2, 517);
+			my_draw_text(text, buf, 16.0, 400 - this_width/2, 487);
 		}
 
 		// only show lead/win/qualify for the last song
@@ -338,7 +338,7 @@ void GroupScreen::draw(unsigned char *buf)
 				conn.perform(FetchMaxScoreForPlayer(tournament, next_player->id, round, &max_score_this_song));
 			}
 
-			unsigned y = 540;
+			unsigned y = 520;
 			
 			// see what score this player must beat to lead
 			unsigned lead_beat = 0, win_beat = 0;
@@ -429,7 +429,7 @@ void GroupScreen::draw(unsigned char *buf)
 				y += 30;
 			}
 
-			if (next_player->total + max_score_this_song > qualify_beat_worst_case) {
+			if (next_player->total + max_score_this_song > qualify_beat_worst_case && (qualify_beat_worst_case != win_beat)) {
 				int qual_need = std::max(qualify_beat_worst_case - next_player->total + 1, 0U);
 				
 				if (qualify_beat_worst_case == qualify_beat_best_case) {