From d14f65c09186284143f2cf6e4fc6b222427f8754 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 26 Dec 2016 18:20:35 +0100 Subject: [PATCH 1/3] supplement to e74d4b0646921ca8dc454c08c6012e362e9a7ef2 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1372a1aff90188206388ae25dedb4e9dc1fa25b0 Author: Jacek Jendrzej Date: 2016-12-26 (Mon, 26 Dec 2016) --- src/gui/widget/stringinput.cpp | 2 +- src/gui/widget/stringinput_ext.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp index 5dd798eb6..037d270e0 100644 --- a/src/gui/widget/stringinput.cpp +++ b/src/gui/widget/stringinput.cpp @@ -494,7 +494,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & ) } else if ( (msg==CRCInput::RC_home) || (msg==CRCInput::RC_timeout) ) { - if ((trim (*valueString) != oldval) && + if ((trim (*valueString) != trim(oldval)) && (ShowMsg(title, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) { timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]); continue; diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp index 0c671e5ee..0de0282d9 100644 --- a/src/gui/widget/stringinput_ext.cpp +++ b/src/gui/widget/stringinput_ext.cpp @@ -267,7 +267,7 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & ) } else if ( (msg==CRCInput::RC_home) || (msg==CRCInput::RC_timeout) ) { - if (trim (*valueString) != oldval){ + if (trim (*valueString) != trim(oldval)){ int erg = ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbNo | CMsgBox::mbYes | CMsgBox::mbCancel); if(erg==CMsgBox::mbrYes){ *valueString = oldval; From a8addbf455b2fd3b7ddff336d6c1751f4f12bc69 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 27 Dec 2016 09:07:19 +0100 Subject: [PATCH 2/3] Revert "fix readepg from sectionsdcontrol" This reverts commit 02f848ab9acbe5769305f510a715899b1722f57b. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/045821729e5cd426e6ed57b12575fe272184f03b Author: vanhofen Date: 2016-12-27 (Tue, 27 Dec 2016) --- src/eitd/sectionsd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index bfe88ed14..e131b423d 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -1225,7 +1225,7 @@ static void commandReadSIfromXML(int connfd, char *data, const unsigned dataLeng writeLockMessaging(); data[dataLength] = '\0'; - std::string load_epg_dir = (std::string)data + "/"; + epg_dir = (std::string)data + "/"; unlockMessaging(); @@ -1233,7 +1233,7 @@ static void commandReadSIfromXML(int connfd, char *data, const unsigned dataLeng pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - if (pthread_create (&thrInsert, &attr, insertEventsfromFile, (void *)load_epg_dir.c_str() )) + if (pthread_create (&thrInsert, &attr, insertEventsfromFile, (void *)epg_dir.c_str() )) { perror("sectionsd: pthread_create()"); } From 798f41e70aea48b582461a7490f3c602b9ab3dea Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 27 Dec 2016 14:21:29 +0100 Subject: [PATCH 3/3] osd-setup: allow higher osd-timeouts; up to 240 sec. now Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/6370ceb010e268690e46ef3098a56c8275e83474 Author: vanhofen Date: 2016-12-27 (Tue, 27 Dec 2016) Origin message was: ------------------ - osd-setup: allow higher osd-timeouts; up to 240 sec. now --- src/gui/osd_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 8bfc58890..7e42f8308 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1014,7 +1014,7 @@ void COsdSetup::showOsdTimeoutSetup(CMenuWidget* menu_timeout) nf += g_Locale->getText(LOCALE_UNIT_SHORT_SECOND); for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++) { - CMenuOptionNumberChooser *ch = new CMenuOptionNumberChooser(timing_setting[i].name, &g_settings.timing[i], true, 0, 180); + CMenuOptionNumberChooser *ch = new CMenuOptionNumberChooser(timing_setting[i].name, &g_settings.timing[i], true, 0, 240); ch->setNumberFormat(nf); ch->setHint("", timing_setting[i].hint); menu_timeout->addItem(ch);