From f8f185465b979076c0a266f11084ee38c3b16f0e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 13 Nov 2017 21:17:36 +0100 Subject: [PATCH] timerlist: don't cast saved_displaymode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0e4a4c1e9b92a4ed788381354accf008489a509d Author: vanhofen Date: 2017-11-13 (Mon, 13 Nov 2017) Origin message was: ------------------ - timerlist: don't cast saved_displaymode ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/timerlist.cpp | 6 ++---- src/gui/timerlist.h | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index ce1077c61..3403cfaae 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -48,7 +48,6 @@ #include #include #include -#include #include #include @@ -287,8 +286,7 @@ CTimerList::CTimerList() httpConnectTimeout = 300; // ms changed = false; - /* most probable default */ - saved_dispmode = (int)CVFD::getInstance()->getMode(); + saved_displaymode = CVFD::getInstance()->getMode(); } CTimerList::~CTimerList() @@ -631,7 +629,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey) } int ret = show(); - CVFD::getInstance()->setMode((CVFD::MODES)saved_dispmode); + CVFD::getInstance()->setMode(saved_displaymode); return ret; /* diff --git a/src/gui/timerlist.h b/src/gui/timerlist.h index e8a30af1f..b0e7b84b9 100644 --- a/src/gui/timerlist.h +++ b/src/gui/timerlist.h @@ -35,6 +35,7 @@ #include +#include #include #include @@ -86,7 +87,7 @@ class CTimerList : public CMenuTarget, public CListHelpers int modifyTimer(); int newTimer(); /* todo: properly import the enum CVFD::MODES */ - int saved_dispmode; + CVFD::MODES saved_displaymode; void RemoteBoxTimerList(CTimerd::TimerList &timerlist); bool RemoteBoxSetup(); void RemoteBoxSelect();