From b08df7e9ab564453d6ab238e4c326ad59608479c Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 20 Feb 2005 19:45:52 +0000 Subject: [PATCH] Don't use split screen if we only have one screen. --- bigscreen/ccbs_bigscreen.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp index d28a56f..527e9c5 100644 --- a/bigscreen/ccbs_bigscreen.cpp +++ b/bigscreen/ccbs_bigscreen.cpp @@ -17,18 +17,19 @@ Tournament active_tournament; std::vector active_groups; std::vector screens; -SplitScreen *mainscreen = NULL; +GenericScreen *mainscreen = NULL; unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4]; void init(pqxx::connection &conn) { + if (screens.size() == 0 || mainscreen != screens[0]) + delete mainscreen; + for (std::vector::const_iterator i = screens.begin(); i != screens.end(); ++i) { delete *i; } screens.erase(screens.begin(), screens.end()); - - delete mainscreen; - + conn.perform(FetchCurrentTournament(&active_tournament)); conn.perform(FetchListOfActiveGroups(&active_groups)); @@ -54,7 +55,11 @@ void init(pqxx::connection &conn) screens.push_back(NULL); screens.push_back(NULL); - mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]); + if (screens[1] == NULL) { + mainscreen = screens[0]; + } else { + mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]); + } } void main_loop(pqxx::connection &conn) @@ -65,7 +70,7 @@ void main_loop(pqxx::connection &conn) return; } - if (mainscreen->check_invalidated()) { + if (mainscreen && mainscreen->check_invalidated()) { mainscreen->draw(framebuf); ptc_update(framebuf); conn.await_notification(0, 10000); -- 2.39.2