From beea385c6daacadd7c64e0f01f8b07ca3688d59f Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 1 May 2019 17:16:12 +0200 Subject: [PATCH] Revert "cc_frm_clock.h: clean up: remove unnecessary virtual declaration" This reverts commit 13dad842e312461319df03612f11d4aae74112ad.This break moviepayer show time Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/01296ab7022e44b1a944776cab4dbe4ca158f7d8 Author: Jacek Jendrzej Date: 2019-05-01 (Wed, 01 May 2019) ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_clock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/components/cc_frm_clock.h b/src/gui/components/cc_frm_clock.h index 4d0ac82aa..0edc8b573 100644 --- a/src/gui/components/cc_frm_clock.h +++ b/src/gui/components/cc_frm_clock.h @@ -84,7 +84,7 @@ class CComponentsFrmClock : public CComponentsForm, public CCTextScreen ///initialize clock contents void initCCLockItems(); ///initialize timestring, called in initCCLockItems() - void initTimeString(); + virtual void initTimeString(); ///start ticking clock, returns true on success, if false causes log output bool startClock();