X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ffetch_group.cpp;h=7962897ca328a7eb9a7f2fae5a04ebfe873d03e6;hp=e1d0112160f2fa6f9e85d692e731f5f0e32fd9d1;hb=20b9ea1a0a1d6f43af9fadeea1ad30aa2304b778;hpb=f40fa6f12fb246c09e925e97bcd7c40f8d2fa59c

diff --git a/bigscreen/fetch_group.cpp b/bigscreen/fetch_group.cpp
index e1d0112..7962897 100644
--- a/bigscreen/fetch_group.cpp
+++ b/bigscreen/fetch_group.cpp
@@ -35,13 +35,24 @@ void FetchGroup::operator() (pqxx::transaction<> &t)
 		Score sc;
 		Song so;
 
-		so.id = i["song"].as(so.id);
-		so.title = i["song"].as(so.title);
-		so.artist = i["song"].as(so.artist);
+		if (i["song"].is_null()) {
+			so.id = -1;
+		} else {
+			so.id = i["song"].as(so.id);
+			so.title = i["song"].as(so.title);
+			so.artist = i["song"].as(so.artist);
+		}
 	
 		sc.song = so;
 		sc.chosen = i["chosen"].as(sc.chosen);
-		sc.score = i["score"].as(sc.score);
+
+		if (i["score"].is_null()) {
+			sc.score = -1;
+		} else {
+			sc.score = i["score"].as(sc.score);
+		}
+
+		std::printf("score: %u\n", sc.score);
 		
 		curr_group.players[curr_group.players.size() - 1].scores.push_back(sc);
 	}