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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 00c8eebe8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-27 (Tue, 27 Dec 2016)
This commit is contained in:
vanhofen
2016-12-27 16:04:31 +01:00
parent 1b308ce365 798f41e70a
commit 0b8fb6f5bd
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eitd/sectionsd.cpp
View File

@@ -1225,7 +1225,7 @@ static void commandReadSIfromXML(int connfd, char *data, const unsigned dataLeng
writeLockMessaging(); writeLockMessaging();
data[dataLength] = '\0'; data[dataLength] = '\0';
std::string load_epg_dir = (std::string)data + "/"; epg_dir = (std::string)data + "/";
unlockMessaging(); unlockMessaging();
@@ -1233,7 +1233,7 @@ static void commandReadSIfromXML(int connfd, char *data, const unsigned dataLeng
pthread_attr_init(&attr); pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); 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()"); perror("sectionsd: pthread_create()");
} }

2
src/gui/osd_setup.cpp
View File

@@ -1087,7 +1087,7 @@ void COsdSetup::showOsdTimeoutSetup(CMenuWidget* menu_timeout)
nf += g_Locale->getText(LOCALE_UNIT_SHORT_SECOND); nf += g_Locale->getText(LOCALE_UNIT_SHORT_SECOND);
for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++) 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->setNumberFormat(nf);
ch->setHint("", timing_setting[i].hint); ch->setHint("", timing_setting[i].hint);
menu_timeout->addItem(ch); menu_timeout->addItem(ch);

2
src/gui/widget/stringinput.cpp
View File

@@ -494,7 +494,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
} }
else if ( (msg==CRCInput::RC_home) || (msg==CRCInput::RC_timeout) ) 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)) { (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]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
continue; continue;

2
src/gui/widget/stringinput_ext.cpp
View File

@@ -267,7 +267,7 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & )
} }
else if ( (msg==CRCInput::RC_home) || (msg==CRCInput::RC_timeout) ) 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); int erg = ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbNo | CMsgBox::mbYes | CMsgBox::mbCancel);
if(erg==CMsgBox::mbrYes){ if(erg==CMsgBox::mbrYes){
*valueString = oldval; *valueString = oldval;