From 0e5303e96d119a3dea122ecbee7d63db65f9a6ed Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 21 Nov 2018 00:00:18 +0100 Subject: [PATCH] cc_frm_clock.cpp/h: fix incomplete result of isRun() methode Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/fa73c2784f8e0e7745f40f32c3dfddf1e7c10168 Author: Thilo Graf Date: 2018-11-21 (Wed, 21 Nov 2018) --- src/gui/components/cc_frm_clock.cpp | 2 +- src/gui/components/cc_frm_clock.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_frm_clock.cpp b/src/gui/components/cc_frm_clock.cpp index 008a18660..ccc4c5fce 100644 --- a/src/gui/components/cc_frm_clock.cpp +++ b/src/gui/components/cc_frm_clock.cpp @@ -29,7 +29,7 @@ #include #include "cc_frm_clock.h" -#include "cc_timer.h" + #include #include diff --git a/src/gui/components/cc_frm_clock.h b/src/gui/components/cc_frm_clock.h index 590353478..78a88ebd8 100644 --- a/src/gui/components/cc_frm_clock.h +++ b/src/gui/components/cc_frm_clock.h @@ -35,6 +35,7 @@ #include "cc_base.h" #include "cc_frm.h" #include "cc_text_screen.h" +#include "cc_timer.h" //! Sub class of CComponents. Show clock with digits on screen. /*! Usable as simple fixed display or as ticking clock. @@ -152,7 +153,7 @@ class CComponentsFrmClock : public CComponentsForm, public CCTextScreen virtual bool isBlocked(void) {return !paintClock;} ///returns true, if clock is running - virtual bool isRun() const {return cl_timer ? true : false;}; + virtual bool isRun() const {return cl_timer ? cl_timer->isRun() : false;} ///set refresh interval in seconds, default value=1 (=1 sec) virtual void setClockInterval(const int& seconds){cl_interval = seconds;}