mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

timerlist: don't cast saved_displaymode

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e4a4c1e9b
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2017-11-13 21:17:36 +01:00
parent da8b6a0bbd
commit f8f185465b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/timerlist.cpp
View File

@@ -48,7 +48,6 @@
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/fade.h> #include <driver/fade.h>
#include <driver/record.h> #include <driver/record.h>
#include <driver/display.h>
#include <gui/channellist.h> #include <gui/channellist.h>
#include <gui/color.h> #include <gui/color.h>
@@ -287,8 +286,7 @@ CTimerList::CTimerList()
httpConnectTimeout = 300; // ms httpConnectTimeout = 300; // ms
changed = false; changed = false;
/* most probable default */ saved_displaymode = CVFD::getInstance()->getMode();
saved_dispmode = (int)CVFD::getInstance()->getMode();
} }
CTimerList::~CTimerList() CTimerList::~CTimerList()
@@ -631,7 +629,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
} }
int ret = show(); int ret = show();
CVFD::getInstance()->setMode((CVFD::MODES)saved_dispmode); CVFD::getInstance()->setMode(saved_displaymode);
return ret; return ret;
/* /*

3
src/gui/timerlist.h
View File

@@ -35,6 +35,7 @@
#include <timerdclient/timerdtypes.h> #include <timerdclient/timerdtypes.h>
#include <driver/display.h>
#include <gui/widget/menue.h> #include <gui/widget/menue.h>
#include <gui/widget/listhelpers.h> #include <gui/widget/listhelpers.h>
@@ -86,7 +87,7 @@ class CTimerList : public CMenuTarget, public CListHelpers
int modifyTimer(); int modifyTimer();
int newTimer(); int newTimer();
/* todo: properly import the enum CVFD::MODES */ /* todo: properly import the enum CVFD::MODES */
int saved_dispmode; CVFD::MODES saved_displaymode;
void RemoteBoxTimerList(CTimerd::TimerList &timerlist); void RemoteBoxTimerList(CTimerd::TimerList &timerlist);
bool RemoteBoxSetup(); bool RemoteBoxSetup();
void RemoteBoxSelect(); void RemoteBoxSelect();