Reset bigscreen on changed groups, not just changed tournaments.

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 9d173b20eac06954834c27f3abf2f2caa64a8528..19937b246f9e10d672b42e14d1221aa7d62fad43 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -173,7 +173,7 @@ void init_freetype()
                fonts.push_back(face);
        }
        
-       // FreeSerif
+       // Arial Unicode MS
        if (FT_New_Face(library, "arialuni.ttf", 0, &face)) {
                std::fprintf(stderr, "Warning: Couldn't open Arial Unicode MS, some glyphs might not be available\n");
        } else {
@@ -249,16 +249,19 @@ int main(int argc, char **argv)
                init_freetype();
                pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_");
                FlagTrigger tournament_changed(conn, "active_tournament");
+               FlagTrigger rounds_changed(conn, "active_groups");
                
-               // when active_tournament is changed, we destroy everything and start from scratch
+               // when active_tournament or active_rounds is changed, we destroy everything and start from scratch
+               // (at least currently)
                for ( ;; ) {
                        tournament_changed.reset_flag();
+                       rounds_changed.reset_flag();
                        init(conn);
                        do {
                                main_loop(conn);
                                conn.get_notifs();
-                       } while (!tournament_changed.get_flag());
-                       std::fprintf(stderr, "active_tournament changed, resetting...\n");
+                       } while (!tournament_changed.get_flag() && !rounds_changed.get_flag());
+                       std::fprintf(stderr, "active_tournament or active_groups changed, resetting...\n");
                }
        } catch (const std::exception &e) {
                std::fprintf(stderr, "Exception: %s\n", e.what());