From c452c45aa60ad4f23dba696a5b474d8efc8b5298 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 28 Jul 2018 17:10:23 +0200 Subject: [PATCH] src/gui/timerlist.cpp: use more plausible SaveScreen methods Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8409532fd1f720b8ea49d3744acb1c044e43ec75 Author: Thilo Graf Date: 2018-07-28 (Sat, 28 Jul 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/timerlist.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 836479cf6..eb077c1c6 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -321,13 +321,13 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey) rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_PORT, true, port, &remotebox_port)); rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_USER, true, user, &remotebox_user)); rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_PASS, true, pass, &remotebox_pass)); - rbsetup->enableSaveScreen(true); + rbsetup->enableSaveScreen(); if ((rbsetup->exec(NULL,"") == true) && (!rbaddress.empty())) { remboxmenu->hide(); - remboxmenu->enableSaveScreen(false); + remboxmenu->disableSaveScreen(); remboxmenu->addItem(new CMenuForwarder(rbname, true, NULL, this, "cha_ip")); - remboxmenu->enableSaveScreen(true); + remboxmenu->enableSaveScreen(); timer_remotebox_item timer_rb; timer_rb.rbaddress = rbaddress; if (!timer_rb.rbaddress.empty()) @@ -351,9 +351,9 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey) if (bselected >= item_offset) { remboxmenu->hide(); - remboxmenu->enableSaveScreen(false); + remboxmenu->disableSaveScreen(); remboxmenu->removeItem(bselected); - remboxmenu->enableSaveScreen(true); + remboxmenu->enableSaveScreen(); bselected = remboxmenu->getSelected(); changed = true; } @@ -386,7 +386,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey) rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_PORT, true, port, &remotebox_port)); rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_USER, true, it->user, &remotebox_user)); rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_PASS, true, it->pass, &remotebox_pass)); - rbsetup->enableSaveScreen(true); + rbsetup->enableSaveScreen(); if ((rbsetup->exec(NULL,"") == true) && (!it->rbaddress.empty())) { it->port = atoi(port); @@ -713,7 +713,7 @@ void CTimerList::RemoteBoxSelect() for (std::vector::iterator it = g_settings.timer_remotebox_ip.begin(); it != g_settings.timer_remotebox_ip.end(); ++it) m->addItem(new CMenuForwarder(it->rbname, it->online, NULL, selector, to_string(std::distance(g_settings.timer_remotebox_ip.begin(),it)).c_str())); - m->enableSaveScreen(true); + m->enableSaveScreen(); m->exec(NULL, ""); delete selector; @@ -1111,7 +1111,7 @@ bool CTimerList::RemoteBoxSetup() remboxmenu->setFooter(RemoteBoxFooterButtons, RemoteBoxFooterButtonCount); - remboxmenu->enableSaveScreen(true); + remboxmenu->enableSaveScreen(); remboxmenu->exec(NULL, ""); if (changed) {