From f9c8a5ddf9f7b571388b76258fc07da64c2526b5 Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 12 Jan 2014 15:35:53 +0100 Subject: [PATCH] gui/timeosd: don't instantiate CComponentsFrmClock in active mode Conflicts: src/gui/timeosd.cpp Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a70560ea580491652cb9f80960d9c8f1db12c166 Author: martii Date: 2014-01-12 (Sun, 12 Jan 2014) ------------------ This commit was generated by Migit --- src/gui/timeosd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/timeosd.cpp b/src/gui/timeosd.cpp index 94b7cca73..09b0fb1e5 100644 --- a/src/gui/timeosd.cpp +++ b/src/gui/timeosd.cpp @@ -36,7 +36,7 @@ -CTimeOSD::CTimeOSD():CComponentsFrmClock( 0, 0, 0, 50, "%H:%M:%S", true, NULL, CC_SHADOW_ON, COL_LIGHT_GRAY, COL_MENUCONTENT_PLUS_0,COL_MENUCONTENTDARK_PLUS_0) +CTimeOSD::CTimeOSD():CComponentsFrmClock( 0, 0, 0, 50, "%H:%M:%S", false, NULL, CC_SHADOW_ON, COL_LIGHT_GRAY, COL_MENUCONTENT_PLUS_0,COL_MENUCONTENTDARK_PLUS_0) { Init(); }